From 8e38cdaa11c03bbb9a0eb777c90a1af00f9283e5 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Sat, 29 Apr 2017 16:13:25 +0200
Subject: [PATCH] simplified

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

diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp
index 2ae63e3e..de535fd8 100644
--- a/src/ebusd/bushandler.cpp
+++ b/src/ebusd/bushandler.cpp
@@ -1471,13 +1471,12 @@ result_t BusHandler::scanAndWait(symbol_t dstAddress, bool loadScanConfig, bool
   }
   if (loadScanConfig) {
     string file;
-    if (result == RESULT_ERR_TIMEOUT) {
+    bool timedOut = result == RESULT_ERR_TIMEOUT;
+    if (timedOut || result == RESULT_OK) {
       result = loadScanConfigFile(m_messages, dstAddress, file);  // try to load even if one message timed out
-      if (result == RESULT_EMPTY) {
+      if (timedOut && 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) {
       executeInstructions(m_messages);