diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-06 10:56:14 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-06 10:56:14 +0100 |
| commit | 05294a8c3fbfffa858c696d7113d4144b584d412 (patch) | |
| tree | 5c648afee1c976881730baf74c3bdc60e0bf7324 /src/imports | |
| parent | 8224fdc2791e0062311f71e8d616a71c2614f903 (diff) | |
| parent | 5685d3b02fb448e74f319de0053e97fff265483a (diff) | |
Merge "Merge remote-tracking branch 'gerrit/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp index 135fe2b7..77c82e94 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp @@ -372,11 +372,10 @@ void QDeclarativeBluetoothDiscoveryModel::setRunning(bool running) d->m_running = running; if (!running) { - if (d->m_deviceAgent) { + if (d->m_deviceAgent) d->m_deviceAgent->stop(); - } else if (d->m_serviceAgent) { + if (d->m_serviceAgent) d->m_serviceAgent->stop(); - } } else { clearModel(); d->m_error = NoError; |