Commit 7857b9c9 authored by Ray Donnelly's avatar Ray Donnelly Committed by Daniel Teske
Browse files

Remove AndroidRunner::asyncStop; always stop synchronously.



Change-Id: Ide262b32146cca6abdb59c26969deb64f255cf10
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 9917f9a7
...@@ -256,10 +256,6 @@ void AndroidRunner::stop() ...@@ -256,10 +256,6 @@ void AndroidRunner::stop()
m_checkPIDTimer.stop(); m_checkPIDTimer.stop();
if (m_processPID == -1) if (m_processPID == -1)
return; // don't emit another signal return; // don't emit another signal
QtConcurrent::run(this, &AndroidRunner::asyncStop);
}
void AndroidRunner::asyncStop()
{
killPID(); killPID();
emit remoteProcessFinished(tr("\n\n'%1' killed.").arg(m_packageName)); emit remoteProcessFinished(tr("\n\n'%1' killed.").arg(m_packageName));
} }
......
...@@ -71,7 +71,6 @@ private slots: ...@@ -71,7 +71,6 @@ private slots:
void logcatReadStandardOutput(); void logcatReadStandardOutput();
void startLogcat(); void startLogcat();
void asyncStart(); void asyncStart();
void asyncStop();
private: private:
void adbKill(qint64 pid, const QString &device, int timeout = 2000, const QString &runAsPackageName = QString()); void adbKill(qint64 pid, const QString &device, int timeout = 2000, const QString &runAsPackageName = QString());
......
Supports Markdown
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