diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2021-08-24 11:02:45 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2021-08-24 09:21:20 +0000 |
| commit | bf2088075dae08b460e44a4d82b133deaade6eb8 (patch) | |
| tree | 6bfe5b50cab89fe8c91882fa45ba09ded785f84a /src | |
| parent | 8c8519853ce9b50d8e30c98a32df4ed90d77cba1 (diff) | |
| download | qt-creator-bf2088075dae08b460e44a4d82b133deaade6eb8.tar.gz | |
Android: Don't crash in AndroidAvdManager
cancelChecker is an optional parameter.
Change-Id: Ie47ae834a34f8ebf8c901e4dcaf7a9c3af5c0ce4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/android/androidavdmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index c75c773042..a26cbaef16 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; |