From daebcfdca99dd3bfc8b60f9fa33fa72d4774f0b5 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 11 Apr 2022 11:52:18 +0300 Subject: [PATCH] Android: fix typo in previous refactoring for AndroidRunnerWorker Pre-start adb commands were executed for a second time instead of the post-finish commands because of typo in variable name, which now is renamed to avoid confusion. Amends 1372dfdf7fc5e0ee04c064568bcd6e45da019db5. Change-Id: Ia89c7835f4a7b9a4d187479962b591b5980387b8 Reviewed-by: Alessandro Portale Reviewed-by: --- src/plugins/android/androidrunnerworker.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 5da5d99ec27..2bf8d60570f 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -290,8 +290,8 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa for (const QString &shellCmd : commands) m_beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd)); } - const auto data = runner->recordedData(Constants::ANDROID_PRESTARTSHELLCMDLIST).toStringList(); - for (const QString &shellCmd : data) + const auto preStartCmdList = runner->recordedData(Constants::ANDROID_PRESTARTSHELLCMDLIST); + for (const QString &shellCmd : preStartCmdList.toStringList()) m_beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd)); if (auto aspect = runControl->aspect(Constants::ANDROID_POSTFINISHSHELLCMDLIST)) { @@ -300,8 +300,8 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa for (const QString &shellCmd : commands) m_afterFinishAdbCommands.append(QString("shell %1").arg(shellCmd)); } - const auto data2 = runner->recordedData(Constants::ANDROID_POSTFINISHSHELLCMDLIST).toStringList(); - for (const QString &shellCmd : data) + const auto postFinishCmdList = runner->recordedData(Constants::ANDROID_POSTFINISHSHELLCMDLIST); + for (const QString &shellCmd : postFinishCmdList.toStringList()) m_afterFinishAdbCommands.append(QString("shell %1").arg(shellCmd)); m_debugServerPath = debugServer(m_useLldb, target).toString();