From ff8057d34bb4e9cf12f5d39b5c1b79ac092b387f Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Sun, 9 Aug 2015 12:40:57 +0200
Subject: - MO now validates session cookie on startup - It also retrieves
 account status - rewrote how MO decides when to log-in/when to give up on
 logging in

---
 src/nexusinterface.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/nexusinterface.cpp')

diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index 5e29e8ee..dc027be4 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -391,8 +391,7 @@ void NexusInterface::nextRequest()
     return;
   }
 
-  if (!getAccessManager()->loggedIn()
-      && requiresLogin(m_RequestQueue.head())) {
+  if (requiresLogin(m_RequestQueue.head()) && !getAccessManager()->loggedIn()) {
     if (!getAccessManager()->loginAttempted()) {
       emit needLogin();
       return;
@@ -438,16 +437,7 @@ void NexusInterface::nextRequest()
   }
   QNetworkRequest request(url);
   request.setHeader(QNetworkRequest::ContentTypeHeader, "application/xml");
-  QStringList comments;
-  comments << "compatible to Nexus Client v" + m_NMMVersion;
-  if (!info.m_SubModule.isEmpty()) {
-    comments << "module: " + info.m_SubModule;
-  }
-
-  QString userAgent = QString("Mod Organizer v%1 (%2)")
-                          .arg(m_MOVersion.displayString())
-                          .arg(comments.join("; "));
-  request.setRawHeader("User-Agent", userAgent.toUtf8());
+  request.setRawHeader("User-Agent", m_AccessManager->userAgent(info.m_SubModule).toUtf8());
 
   info.m_Reply = m_AccessManager->get(request);
 
-- 
cgit v1.3.1