From 49f6e5c0fc93b57f911d1a35ba22ca3279a15aaf Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Mon, 17 Apr 2017 12:49:54 +0200
Subject: [PATCH] try to load scan config even if one message timed out

---
 src/ebusd/bushandler.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp
index 754fb551..4177f909 100644
--- a/src/ebusd/bushandler.cpp
+++ b/src/ebusd/bushandler.cpp
@@ -1434,12 +1434,16 @@ result_t BusHandler::scanAndWait(symbol_t dstAddress, bool loadScanConfig, bool
     delete request;
     request = NULL;
   }
-  if (result != RESULT_OK) {
-    return result;
-  }
   if (loadScanConfig) {
     string file;
-    result = loadScanConfigFile(m_messages, dstAddress, file);
+    if (result == RESULT_ERR_TIMEOUT) {
+      result = loadScanConfigFile(m_messages, dstAddress, file);  // try to load even if one message timed out
+      if (result == RESULT_EMPTY) {
+        result = RESULT_ERR_TIMEOUT;  // back to previous result
+      }
+    } else if (result == RESULT_OK) {
+      result = loadScanConfigFile(m_messages, dstAddress, file);
+    }
     if (result == RESULT_OK) {
       setScanConfigLoaded(dstAddress, file);
       if (!hasAdditionalScanMessages && m_messages->hasAdditionalScanMessages()) {