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

QNX: Fixed running the application if first attempt failed



When the first attempt to run an application on the BlackBerry device failed,
e.g. due to not being able to connect to the device, the Play button remained
disabled, so any subsequent attempts to run the application was not possible.

Change-Id: I2b9778f7b936e06b2594d2485d7e5575cddbba14
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 7aeac1d5
...@@ -155,6 +155,7 @@ void BlackBerryApplicationRunner::startFinished(int exitCode, QProcess::ExitStat ...@@ -155,6 +155,7 @@ void BlackBerryApplicationRunner::startFinished(int exitCode, QProcess::ExitStat
const QString errorString = (m_launchProcess->error() != QProcess::UnknownError) const QString errorString = (m_launchProcess->error() != QProcess::UnknownError)
? m_launchProcess->errorString() : tr("Launching application failed"); ? m_launchProcess->errorString() : tr("Launching application failed");
emit startFailed(errorString); emit startFailed(errorString);
reset();
} }
} }
...@@ -344,9 +345,11 @@ void BlackBerryApplicationRunner::reset() ...@@ -344,9 +345,11 @@ void BlackBerryApplicationRunner::reset()
m_stopping = false; m_stopping = false;
m_runningStateTimer->stop(); m_runningStateTimer->stop();
if (m_runningStateProcess) {
m_runningStateProcess->terminate(); m_runningStateProcess->terminate();
if (!m_runningStateProcess->waitForFinished(1000)) if (!m_runningStateProcess->waitForFinished(1000))
m_runningStateProcess->kill(); m_runningStateProcess->kill();
}
if (m_tailProcess && m_tailProcess->isProcessRunning()) if (m_tailProcess && m_tailProcess->isProcessRunning())
killTailProcess(); killTailProcess();
......
Supports Markdown
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