config: Integrate HASCONFIG into CConfigManager::getConfigValueSafeDevice (#3195)

1 files changed, 5 insertions, 3 deletions

diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index 0865eae6..01b099f7 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -1691,13 +1691,15 @@ SConfigValue CConfigManager::getConfigValueSafeDevice(const std::string& dev, co
     const auto                  it = deviceConfigs.find(dev);
 
     if (it == deviceConfigs.end()) {
-        Debug::log(ERR, "getConfigValueSafeDevice: No device config for {} found???", dev.c_str());
-        return SConfigValue();
+        if (fallback.empty()) {
+            Debug::log(ERR, "getConfigValueSafeDevice: No device config for {} found???", dev.c_str());
+            return SConfigValue();
+        }
+        return configValues[fallback];
     }
 
     const SConfigValue DEVICECONFIG = it->second[val];
 
-    // fallback if not set explicitly
     if (!DEVICECONFIG.set && !fallback.empty()) {
         return configValues[fallback];
     }