Check all unchecked return values and guard error pathsHEADmaster

1 files changed, 15 insertions, 7 deletions

diff --git a/src/OpcUaClient.cpp b/src/OpcUaClient.cpp
index d212ab2..8835a08 100644
--- a/src/OpcUaClient.cpp
+++ b/src/OpcUaClient.cpp
@@ -173,7 +173,11 @@ OpcUaClient::connectToServer ()
           QStringLiteral ("Invalid server URL: %1").arg (m_serverUrl));
       return;
     }
-  m_client->requestEndpoints (url);
+  if (!m_client->requestEndpoints (url))
+    {
+      emit connectionError (
+          QStringLiteral ("Failed to send endpoint request"));
+    }
 }
 
 void
@@ -354,11 +358,14 @@ OpcUaClient::handlePasswordRequired (QString keyFilePath, QString *password,
   m_keyPassword.clear ();
   emit privateKeyPasswordRequired (keyFilePath, previousTryWasInvalid);
 
-  QEventLoop loop;
-  m_keyPassLoop = &loop;
-  QTimer::singleShot (30000, &loop, &QEventLoop::quit);
-  loop.exec ();
-  m_keyPassLoop = nullptr;
+  if (m_keyPassword.isEmpty ())
+    {
+      QEventLoop loop;
+      m_keyPassLoop = &loop;
+      QTimer::singleShot (30000, &loop, &QEventLoop::quit);
+      loop.exec ();
+      m_keyPassLoop = nullptr;
+    }
 
   *password = m_keyPassword;
 }
@@ -448,7 +455,8 @@ OpcUaClient::doDiscovery ()
   QUrl url (m_discoveryUrl);
   if (!url.isValid ())
     return;
-  m_client->findServers (url);
+  if (!m_client->findServers (url))
+    emit statusMessage (QStringLiteral ("Failed to send discovery request"));
 }
 
 void