Merge remote-tracking branch 'gerrit/5.5' into 5.6

Change-Id: I9d78ba7ad02848e3166a29c9f2d4876dd1bc1e96

1 files changed, 2 insertions, 0 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
index b0fd88d5..18accdf5 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
@@ -253,6 +253,8 @@ void QBluetoothDeviceDiscoveryAgentPrivate::startBluez5()
                         continue; //devices whose path doesn't start with same path we skip
 
                     deviceFoundBluez5(path.path());
+                    if (!isActive()) // Can happen if stop() was called from a slot in user code.
+                      return;
                 }
             }
         }