Commit b57e3724 authored by BogDan Vatra's avatar BogDan Vatra Committed by Daniel Teske

Fix AndroidRunner stop action.

When the stop button was pressed nothing happened

Change-Id: I58a05aa3a4ea990595298cde0a330b382b65b035
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 6fc9c073
......@@ -254,16 +254,11 @@ void AndroidRunner::startLogcat()
void AndroidRunner::stop()
{
QMutexLocker locker(&m_mutex);
m_adbLogcatProcess.kill();
m_checkPIDTimer.stop();
if (m_processPID == -1) {
m_adbLogcatProcess.kill();
return; // don't emit another signal
}
}
void AndroidRunner::asyncStop()
{
killPID();
m_adbLogcatProcess.kill();
m_adbLogcatProcess.waitForFinished(-1);
......
......@@ -56,7 +56,6 @@ public:
public slots:
void start();
void stop();
void asyncStop();
signals:
void remoteProcessStarted(int gdbServerPort = -1, int qmlPort = -1);
......
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