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

Fix AndroidRunner

Browse Source 
"m_tries" and "m_wasStarted" must be initialized before "m_psProc-
>start" call, because m_psProc will emit "QIODevice::readyRead" signal
before the function ends.

Change-Id: I10c63ca2d15c362d6df04018757b1916b9989893
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
BogDan Vatra
2016-11-07 15:13:02 +02:00
parent 3893ffa039
commit de687f5f9e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,6 +388,9 @@ void AndroidRunnerWorker::forceStop()
void AndroidRunnerWorker::asyncStart(const QString &intentName, void AndroidRunnerWorker::asyncStart(const QString &intentName,
const QVector<QStringList> &adbCommands) const QVector<QStringList> &adbCommands)
{ {
m_tries = 0;
m_wasStarted = false;
// Its assumed that the device or avd serial returned by selector() is online. // Its assumed that the device or avd serial returned by selector() is online.
m_adbLogcatProcess->start(m_adb, selector() << "logcat"); m_adbLogcatProcess->start(m_adb, selector() << "logcat");
m_psProc->start(m_adb, selector() << "shell" m_psProc->start(m_adb, selector() << "shell"
@@ -526,9 +529,6 @@ void AndroidRunnerWorker::asyncStart(const QString &intentName,
} }
} }
m_tries = 0;
m_wasStarted = false;
} }
bool AndroidRunnerWorker::adbShellAmNeedsQuotes() bool AndroidRunnerWorker::adbShellAmNeedsQuotes()