From e6c3c8c43492a398b17e2bdf3bbe43915077659a Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 30 Oct 2024 08:40:14 +0100
Subject: [PATCH] Android: Fix handling unsuccessful AVD start

We do want to execute onSerialNumberDone, even when
startAvdRecipe finished with an error.

Amends d21120801115f83acb1a727cf5cc5693d2a49c62

Change-Id: Iaa209c37bd05b0319a36541df6c8f06c21ab02ca
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 src/plugins/android/androiddeployqtstep.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 05cf846aef2..ff15e9f6c48 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -362,10 +362,8 @@ GroupItem AndroidDeployQtStep::runRecipe()
 {
     const Storage<QString> serialNumberStorage;
 
-    const auto onSerialNumberGroupSetup = [this] {
-        return m_avdName.isEmpty() ? SetupResult::StopWithSuccess : SetupResult::Continue;
-    };
-    const auto onSerialNumberSync = [this, serialNumberStorage] {
+    const auto isAvdNameEmpty = [this] { return m_avdName.isEmpty(); };
+    const auto onSerialNumberDone = [this, serialNumberStorage] {
         const QString serialNumber = *serialNumberStorage;
         if (serialNumber.isEmpty()) {
             reportWarningOrError(Tr::tr("The deployment AVD \"%1\" cannot be started.")
@@ -411,11 +409,10 @@ GroupItem AndroidDeployQtStep::runRecipe()
     };
 
     return Group {
-        Group {
+        If (!Sync(isAvdNameEmpty)) >> Then {
             serialNumberStorage,
-            onGroupSetup(onSerialNumberGroupSetup),
             AndroidAvdManager::startAvdRecipe(m_avdName, serialNumberStorage),
-            Sync(onSerialNumberSync)
+            onGroupDone(onSerialNumberDone)
         },
         deployRecipe(),
         For (iterator) >> Do {