From d21120801115f83acb1a727cf5cc5693d2a49c62 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 29 Oct 2024 10:53:04 +0100 Subject: [PATCH] Android: Fix deployment to the real device Don't invoke onSerialNumberGroupDone handler when onGroupSetup returned StopWithSuccess. To achieve it we change onGroupDone into Sync. Amends 59c10c1274ced53ef494fc0a1f7cea06b3f5c5a7 Change-Id: Ia77eef3bdc4ca04bf9169d9867cdd72b7e14ebae Reviewed-by: Eike Ziller --- src/plugins/android/androiddeployqtstep.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 21891e4878c..05cf846aef2 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -365,7 +365,7 @@ GroupItem AndroidDeployQtStep::runRecipe() const auto onSerialNumberGroupSetup = [this] { return m_avdName.isEmpty() ? SetupResult::StopWithSuccess : SetupResult::Continue; }; - const auto onSerialNumberGroupDone = [this, serialNumberStorage] { + const auto onSerialNumberSync = [this, serialNumberStorage] { const QString serialNumber = *serialNumberStorage; if (serialNumber.isEmpty()) { reportWarningOrError(Tr::tr("The deployment AVD \"%1\" cannot be started.") @@ -415,7 +415,7 @@ GroupItem AndroidDeployQtStep::runRecipe() serialNumberStorage, onGroupSetup(onSerialNumberGroupSetup), AndroidAvdManager::startAvdRecipe(m_avdName, serialNumberStorage), - onGroupDone(onSerialNumberGroupDone) + Sync(onSerialNumberSync) }, deployRecipe(), For (iterator) >> Do {