Merge

5 files changed, 12 insertions, 8 deletions

diff --git a/src/browserdialog.cpp b/src/browserdialog.cpp
index 81a5db68..4aa4e969 100644
--- a/src/browserdialog.cpp
+++ b/src/browserdialog.cpp
@@ -43,7 +43,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 BrowserDialog::BrowserDialog(QWidget *parent)
   : QDialog(parent)
   , ui(new Ui::BrowserDialog)
-  , m_AccessManager(new QNetworkAccessManager)
+  , m_AccessManager(new QNetworkAccessManager(this))
 {
   ui->setupUi(this);
 
diff --git a/src/dlls.manifest.qt5 b/src/dlls.manifest.qt5
index ed82e878..0a8ba7b8 100644
--- a/src/dlls.manifest.qt5
+++ b/src/dlls.manifest.qt5
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

     <assemblyIdentity type="win32" name="dlls" version="1.0.0.0" processorArchitecture="x86"/>

-    <file name="icuin49.dll"/>

-    <file name="icuuc49.dll"/>

-    <file name="icudt49.dll"/>

+    <file name="icuin52.dll"/>

+    <file name="icuuc52.dll"/>

+    <file name="icudt52.dll"/>

     <file name="Qt5Core.dll"/>

     <file name="Qt5Declarative.dll"/>

     <file name="Qt5Gui.dll"/>

@@ -14,4 +14,4 @@
     <file name="Qt5Widgets.dll"/>

     <file name="Qt5Xml.dll"/>

     <file name="Qt5XmlPatterns.dll"/>

-</assembly>

+</assembly>
\ No newline at end of file
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index d6456fc7..2d2b85c8 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -1337,8 +1337,11 @@ void DownloadManager::downloadFinished()
   DownloadInfo *info = findDownload(this->sender(), &index);
   if (info != NULL) {
     QNetworkReply *reply = info->m_Reply;
-    QByteArray data = info->m_Reply->readAll();
-    info->m_Output.write(data);
+    QByteArray data;
+    if (reply->isOpen()) {
+      data = reply->readAll();
+      info->m_Output.write(data);
+    }
     info->m_Output.close();
     TaskProgressManager::instance().forgetMe(info->m_TaskProgressId);
 
diff --git a/src/messagedialog.cpp b/src/messagedialog.cpp
index 62696938..2aa07ccf 100644
--- a/src/messagedialog.cpp
+++ b/src/messagedialog.cpp
@@ -81,6 +81,7 @@ void MessageDialog::resizeEvent(QResizeEvent *event)
 
 void MessageDialog::showMessage(const QString &text, QWidget *reference, bool bringToFront)
 {
+  qDebug("%s", qPrintable(text));
   if (reference != NULL) {
     if (bringToFront || (qApp->activeWindow() != NULL)) {
       MessageDialog *dialog = new MessageDialog(text, reference);
diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp
index b65ff082..d8411602 100644
--- a/src/nxmaccessmanager.cpp
+++ b/src/nxmaccessmanager.cpp
@@ -122,7 +122,7 @@ void NXMAccessManager::login(const QString &username, const QString &password)
 
 void NXMAccessManager::pageLogin()
 {
-  QString requestString = QString("http://gatekeeper.nexusmods.com/Sessions/?Login&uri=%1")
+  QString requestString = (ToQString(GameInfo::instance().getNexusPage(false)) + "/sessions/?Login&uri=%1")
                              .arg(QString(QUrl::toPercentEncoding(ToQString(GameInfo::instance().getNexusPage()))));
 
   QNetworkRequest request(requestString);