diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-07-06 19:07:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-07 07:35:00 +0000 |
| commit | d5b75c71dd6ea917218cb18a62e5ddf1f7e1a666 (patch) | |
| tree | a5cc0e4aa38a779fdec1ecba46f7eb5ed0e816b0 | |
| parent | b1d6ab754aeb8f63334bafb6390e8285b9f154c2 (diff) | |
WinDebugThread: Don't handle our own debug output
As handling debug output is synchronous.
Change-Id: Ia3b84065698e2fe7903cd490b72686ceec06bdde
Task-number: QTCREATORBUG-14676
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
| -rw-r--r-- | src/plugins/projectexplorer/windebuginterface.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/windebuginterface.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/windebuginterface.cpp b/src/plugins/projectexplorer/windebuginterface.cpp index e084aa4447..9b88311adf 100644 --- a/src/plugins/projectexplorer/windebuginterface.cpp +++ b/src/plugins/projectexplorer/windebuginterface.cpp @@ -33,6 +33,7 @@ #ifdef Q_OS_WIN #include <windows.h> +#include <QApplication> /*! @@ -68,6 +69,7 @@ WinDebugInterface::WinDebugInterface(QObject *parent) : QThread(parent) { m_instance = this; + m_creatorPid = qApp->applicationPid(); setObjectName(QLatin1String("WinDebugInterfaceThread")); } @@ -138,7 +140,8 @@ bool WinDebugInterface::runLoop() if (ret == WAIT_FAILED || ret - WAIT_OBJECT_0 == TerminateEventHandle) break; if (ret - WAIT_OBJECT_0 == DataReadyEventHandle) { - emit debugOutput(*processId, QString::fromLocal8Bit(message)); + if (*processId != m_creatorPid) + emit debugOutput(*processId, QString::fromLocal8Bit(message)); SetEvent(m_bufferReadyEvent); } } diff --git a/src/plugins/projectexplorer/windebuginterface.h b/src/plugins/projectexplorer/windebuginterface.h index d8175a229c..4378d4e69d 100644 --- a/src/plugins/projectexplorer/windebuginterface.h +++ b/src/plugins/projectexplorer/windebuginterface.h @@ -60,6 +60,7 @@ private: static WinDebugInterface *m_instance; + qint64 m_creatorPid; Qt::HANDLE m_waitHandles[HandleCount]; Qt::HANDLE m_bufferReadyEvent; Qt::HANDLE m_sharedFile; |