From bf2088075dae08b460e44a4d82b133deaade6eb8 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 24 Aug 2021 11:02:45 +0200 Subject: [PATCH] Android: Don't crash in AndroidAvdManager cancelChecker is an optional parameter. Change-Id: Ie47ae834a34f8ebf8c901e4dcaf7a9c3af5c0ce4 Reviewed-by: Christian Kandeler --- src/plugins/android/androidavdmanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index c75c773042e..a26cbaef16d 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -333,7 +333,7 @@ QString AndroidAvdManager::waitForAvd(const QString &avdName, // 60 rounds of 2s sleeping, two minutes for the avd to start QString serialNumber; for (int i = 0; i < 60; ++i) { - if (cancelChecker()) + if (cancelChecker && cancelChecker()) return QString(); serialNumber = findAvd(avdName); if (!serialNumber.isEmpty()) @@ -365,7 +365,7 @@ bool AndroidAvdManager::waitForBooted(const QString &serialNumber, { // found a serial number, now wait until it's done booting... for (int i = 0; i < 60; ++i) { - if (cancelChecker()) + if (cancelChecker && cancelChecker()) return false; if (isAvdBooted(serialNumber)) { return true;