3 files changed, 6 insertions(+), 2 deletions(-)

M module-apps/application-settings-new/windows/AllDevicesWindow.cpp
M module-bluetooth/Bluetooth/CommandHandler.cpp
M module-bluetooth/lib/btstack

@@ 38,8 38,11 @@ namespace gui
                                     "cross");
     }
 
-    void AllDevicesWindow::onBeforeShow(ShowMode /*mode*/, SwitchData *data)
+    void AllDevicesWindow::onBeforeShow(ShowMode mode, SwitchData *data)
     {
+        if (mode == ShowMode::GUI_SHOW_RETURN) {
+            bluetoothSettingsModel->stopScan();
+        }
         const auto newData = dynamic_cast<BondedDevicesData *>(data);
         if (newData != nullptr) {
             devices                  = newData->getDevices();

@@ 90,6 90,7 @@ namespace bluetooth
 
     Error::Code CommandHandler::stopScan()
     {
+        LOG_INFO("Stopping scan!");
         driver->stopScan();
         static_cast<ServiceBluetooth *>(service)->scanStoppedCallback();
         return Error::Success;

@@ 1,1 1,1 @@
-Subproject commit 50e2ffe2ac7968e178cd0bc183b48c12c9d06834
+Subproject commit 45e9304c0b9f764e195c54b23136a948071fd4e5