feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix AndroidRunner stop action.

Browse Source 
When the stop button was pressed nothing happened

Change-Id: I58a05aa3a4ea990595298cde0a330b382b65b035
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2013-01-23 20:26:03 +02:00
committed by Daniel Teske
parent 6fc9c0732b
commit b57e37243d
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidrunner.cpp
View File

@@ -254,16 +254,11 @@ void AndroidRunner::startLogcat()
void AndroidRunner::stop() void AndroidRunner::stop()
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
m_adbLogcatProcess.kill();
m_checkPIDTimer.stop(); m_checkPIDTimer.stop();
if (m_processPID == -1) { if (m_processPID == -1) {
m_adbLogcatProcess.kill(); m_adbLogcatProcess.kill();
return; // don't emit another signal return; // don't emit another signal
} }
}
void AndroidRunner::asyncStop()
{
killPID(); killPID();
m_adbLogcatProcess.kill(); m_adbLogcatProcess.kill();
m_adbLogcatProcess.waitForFinished(-1); m_adbLogcatProcess.waitForFinished(-1);

1
src/plugins/android/androidrunner.h
View File

@@ -56,7 +56,6 @@ public:
public slots: public slots:
void start(); void start();
void stop(); void stop();
void asyncStop();
signals: signals:
void remoteProcessStarted(int gdbServerPort = -1, int qmlPort = -1); void remoteProcessStarted(int gdbServerPort = -1, int qmlPort = -1);