diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index fa6dc5a415f..f5febfc275a 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -101,7 +101,6 @@ void AndroidRunner::start() runnerRecipe(glueStorage) }; m_taskTreeRunner.start(recipe); - m_packageName = AndroidManager::packageName(target); } void AndroidRunner::stop() @@ -110,8 +109,6 @@ void AndroidRunner::stop() return; emit canceled(); - appendMessage(Tr::tr("Android target \"%1\" terminated.").arg(m_packageName), - Utils::NormalMessageFormat); } void AndroidRunner::qmlServerPortReady(Port port) diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h index 0a6d6a0fedf..7ec2babb7b0 100644 --- a/src/plugins/android/androidrunner.h +++ b/src/plugins/android/androidrunner.h @@ -46,7 +46,6 @@ private: Utils::ProcessHandle m_pid; QmlDebug::QmlOutputParser m_outputParser; Tasking::TaskTreeRunner m_taskTreeRunner; - QString m_packageName; }; } // namespace Android::Internal diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index abc56ea13a1..4033a86d2ce 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -581,10 +581,11 @@ static ExecutableItem postDoneRecipe(const Storage &storage) const auto onDone = [storage] { storage->m_processPID = -1; storage->m_processUser = -1; - if (!storage->m_glue->wasCancelled()) { - storage->m_glue->setFinished(Tr::tr("Android target \"%1\" died.") - .arg(storage->m_packageName)); - } + const QString package = storage->m_packageName; + const QString message = storage->m_glue->wasCancelled() + ? Tr::tr("Android target \"%1\" terminated.").arg(package) + : Tr::tr("Android target \"%1\" died.").arg(package); + storage->m_glue->setFinished(message); }; return Group {