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

Android: Don't read from adb logcat while PID isn't known

Browse Source 
Otherwise we throw away important parts of the output.

Change-Id: I7ab6989c19660bcbb53d6ff61eda62878044ded2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Ulf Hermann
2014-03-13 16:21:36 +01:00
parent 911f6b5159
commit f5dc6bed45
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,6 +183,7 @@ void AndroidRunner::checkPID()
emit remoteProcessStarted(-1, -1); emit remoteProcessStarted(-1, -1);
} }
m_wasStarted = true; m_wasStarted = true;
logcatReadStandardOutput();
} }
} }
@@ -357,6 +358,8 @@ void AndroidRunner::logcatReadStandardError()
void AndroidRunner::logcatReadStandardOutput() void AndroidRunner::logcatReadStandardOutput()
{ {
if (m_processPID == -1)
return;
QList<QByteArray> lines = m_adbLogcatProcess.readAllStandardOutput().split('\n'); QList<QByteArray> lines = m_adbLogcatProcess.readAllStandardOutput().split('\n');
// lines always contains at least one item // lines always contains at least one item
lines[0].prepend(m_logcat); lines[0].prepend(m_logcat);