Commit aa8a0cf0 authored by Tobias Nätterlund's avatar Tobias Nätterlund Committed by Daniel Teske
Browse files

QNX: Fixed asserts when stopping application on BlackBerry device



Change-Id: I0283d2a8c27e51f38c2e0939440bdbbef0063353
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent fdd4a815
......@@ -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());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment