QNX: Fixed asserts when stopping application on BlackBerry device

Change-Id: I0283d2a8c27e51f38c2e0939440bdbbef0063353
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/qnx/blackberryapplicationrunner.cpp b/src/plugins/qnx/blackberryapplicationrunner.cpp
index c946584ddf..e22e006d15 100644
--- a/src/plugins/qnx/blackberryapplicationrunner.cpp
+++ b/src/plugins/qnx/blackberryapplicationrunner.cpp
@@ -161,6 +161,9 @@ void BlackBerryApplicationRunner::startFinished(int exitCode, QProcess::ExitStat
 
 ProjectExplorer::RunControl::StopResult BlackBerryApplicationRunner::stop()
 {
+    if (m_stopping)
+        return ProjectExplorer::RunControl::AsynchronousStop;
+
     m_stopping = true;
 
     QStringList args;
@@ -180,14 +183,13 @@ ProjectExplorer::RunControl::StopResult BlackBerryApplicationRunner::stop()
         m_stopProcess->setEnvironment(m_environment.toStringList());
     }
 
-
     m_stopProcess->start(m_deployCmd, args);
     return ProjectExplorer::RunControl::AsynchronousStop;
 }
 
 bool BlackBerryApplicationRunner::isRunning() const
 {
-    return m_running && !m_stopping;
+    return m_running;
 }
 
 qint64 BlackBerryApplicationRunner::pid() const
@@ -248,7 +250,7 @@ void BlackBerryApplicationRunner::tailApplicationLog()
 {
     // TODO: Reading the log using qconn instead?
 
-    if (m_tailProcess && m_tailProcess->isProcessRunning())
+    if (m_stopping || (m_tailProcess && m_tailProcess->isProcessRunning()))
         return;
 
     QTC_CHECK(!m_appId.isEmpty());