Android: Fix crash on exitv7.0.0-beta2

m_adbDeviceWatcherProcess can be 0 if Android is not set up.

Amends: c43ba1ae329937db62c4824311fe017b68b6033f

Change-Id: I90aef197c098f279a6bd3adb0485df74b8be1961
Reviewed-by: Eike Ziller <[email protected]>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index b7927d0aa8c..f6e036b1d68 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -753,9 +753,11 @@ AndroidDeviceManager::AndroidDeviceManager(QObject *parent)
       m_avdManager(m_androidConfig)
 {
     connect(qApp, &QCoreApplication::aboutToQuit, this, [this]() {
-        m_adbDeviceWatcherProcess->terminate();
-        m_adbDeviceWatcherProcess->waitForFinished();
-        m_adbDeviceWatcherProcess.reset();
+        if (m_adbDeviceWatcherProcess) {
+            m_adbDeviceWatcherProcess->terminate();
+            m_adbDeviceWatcherProcess->waitForFinished();
+            m_adbDeviceWatcherProcess.reset();
+        }
         m_avdsFutureWatcher.waitForFinished();
         m_removeAvdFutureWatcher.waitForFinished();
     });