Improve failed login checks on start up

2 files changed, 4 insertions, 2 deletions

diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp
index 428aa3f3..88d38b9e 100644
--- a/src/nxmaccessmanager.cpp
+++ b/src/nxmaccessmanager.cpp
@@ -235,9 +235,11 @@ void NXMAccessManager::validateError(QNetworkReply::NetworkError)
   m_ValidateState = VALIDATE_NOT_VALID;
 
   if (m_ValidateReply != nullptr) {
-    emit validateFailed(m_ValidateReply->errorString());
+    m_ValidateReply->disconnect();
+    QString error = m_ValidateReply->errorString();
     m_ValidateReply->deleteLater();
     m_ValidateReply = nullptr;
+    emit validateFailed(error);
   } else {
     emit validateFailed(tr("Unknown error"));
   }
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index ade8a9e3..9c883eb7 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -642,7 +642,7 @@ bool OrganizerCore::nexusApi(bool retry)
     return false;
   } else {
     QString apiKey;
-    if (!retry && m_Settings.getNexusApiKey(apiKey)) {
+    if (m_Settings.getNexusApiKey(apiKey)) {
       // credentials stored or user entered them manually
       qDebug("attempt to verify nexus api key");
       accessManager->apiCheck(apiKey);