DBTAdapter: Resolve uninitialized nextMetaScanType and refine with hasScanType(eventScanType, ScanType::LE)

Note: '-Wmaybe-uninitialized' didn't trigger this when building in DEBUG mode using g++ 10

1 files changed, 9 insertions, 2 deletions

diff --git a/src/direct_bt/DBTAdapter.cpp b/src/direct_bt/DBTAdapter.cpp
index 0a20736f..bd7101c5 100644
--- a/src/direct_bt/DBTAdapter.cpp
+++ b/src/direct_bt/DBTAdapter.cpp
@@ -714,9 +714,16 @@ bool DBTAdapter::mgmtEvDeviceDiscoveringAny(std::shared_ptr<MgmtEvent> e, const
 
     ScanType nextMetaScanType;
     if( eventEnabled ) {
+        // enabled eventScanType
         nextMetaScanType = changeScanType(currentMetaScanType, eventScanType, true);
-    } else if( !keep_le_scan_alive ) {
-        nextMetaScanType = changeScanType(currentMetaScanType, eventScanType, false);
+    } else {
+        // disabled eventScanType
+        if( hasScanType(eventScanType, ScanType::LE) && keep_le_scan_alive ) {
+            // Unchanged meta for disabled-LE && keep_le_scan_alive
+            nextMetaScanType = currentMetaScanType;
+        } else {
+            nextMetaScanType = changeScanType(currentMetaScanType, eventScanType, false);
+        }
     }
 
     if( !hciSourced ) {