diff options
Diffstat (limited to 'src/plugins/android/androidrunner.cpp')
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index f820a73835..732863168b 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -86,6 +86,8 @@ AndroidRunner::AndroidRunner(QObject *parent, AndroidRunConfiguration *runConfig QByteArray which = psProc.readAll(); m_isBusyBox = which.startsWith("busybox"); + m_checkPIDTimer.setInterval(1000); + connect(&m_adbLogcatProcess, SIGNAL(readyReadStandardOutput()), SLOT(logcatReadStandardOutput())); connect(&m_adbLogcatProcess, SIGNAL(readyReadStandardError()), SLOT(logcatReadStandardError())); connect(&m_checkPIDTimer, SIGNAL(timeout()), SLOT(checkPID())); @@ -139,8 +141,10 @@ void AndroidRunner::checkPID() return; QByteArray psOut = runPs(); m_processPID = extractPid(m_packageName, psOut); - if (m_processPID == -1) + if (m_processPID == -1) { + m_checkPIDTimer.stop(); emit remoteProcessFinished(tr("\n\n'%1' died.").arg(m_packageName)); + } } void AndroidRunner::forceStop() @@ -171,7 +175,6 @@ void AndroidRunner::start() { m_adbLogcatProcess.start(m_adb, selector() << _("logcat")); m_wasStarted = false; - m_checkPIDTimer.start(1000); // check if the application is alive every 1 seconds QtConcurrent::run(this, &AndroidRunner::asyncStart); } @@ -285,6 +288,8 @@ void AndroidRunner::asyncStart() return; } + QMetaObject::invokeMethod(&m_checkPIDTimer, "start"); + m_wasStarted = true; if (m_useCppDebugger || m_useQmlDebugger) { // This will be funneled to the engine to actually start and attach |