From 477ebd3b610a127ed3e914508455677c832f17f4 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 23 Feb 2022 09:47:42 +0100 Subject: Android: Fix crash on exit m_adbDeviceWatcherProcess can be 0 if Android is not set up. Amends: c43ba1ae329937db62c4824311fe017b68b6033f Change-Id: I90aef197c098f279a6bd3adb0485df74b8be1961 Reviewed-by: Eike Ziller --- src/plugins/android/androiddevice.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index b7927d0aa8..f6e036b1d6 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(); }); -- cgit v1.2.3