nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try to load scan config even if one message timed out

Browse Source
This commit is contained in:
john30
2017-04-17 12:49:54 +02:00
parent 87aaba96c9
commit 49f6e5c0fc
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+8 -4
View File
@@ -1434,12 +1434,16 @@ result_t BusHandler::scanAndWait(symbol_t dstAddress, bool loadScanConfig, bool
delete request; delete request;
request = NULL; request = NULL;
} }
if (result != RESULT_OK) {
return result;
}
if (loadScanConfig) { if (loadScanConfig) {
string file; 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) { if (result == RESULT_OK) {
setScanConfigLoaded(dstAddress, file); setScanConfigLoaded(dstAddress, file);
if (!hasAdditionalScanMessages && m_messages->hasAdditionalScanMessages()) { if (!hasAdditionalScanMessages && m_messages->hasAdditionalScanMessages()) {