diff options
author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-10-16 13:35:04 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-10-16 13:35:04 +0000 |
commit | 3f5af7545da59a8f092e239add3b17bb43d704d3 (patch) | |
tree | 5adf03af0c0cf7a3c809e2049b15917094981ddb /src/plugins/debugger/logwindow.cpp | |
parent | 50deb50069ed47ec66cacb170413b47e60b2044e (diff) | |
parent | fcb12a275f856b7f871aff8aae9f70a8e28635bc (diff) |
Merge "Merge remote-tracking branch 'origin/4.10' into 4.11" into 4.11
Diffstat (limited to 'src/plugins/debugger/logwindow.cpp')
-rw-r--r-- | src/plugins/debugger/logwindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp index d50ca6e96c..be869585a5 100644 --- a/src/plugins/debugger/logwindow.cpp +++ b/src/plugins/debugger/logwindow.cpp @@ -567,7 +567,8 @@ void LogWindow::doOutput() if (m_queuedOutput.isEmpty()) return; - theGlobalLog->doOutput(m_queuedOutput); + if (theGlobalLog) + theGlobalLog->doOutput(m_queuedOutput); QTextCursor cursor = m_combinedText->textCursor(); const bool atEnd = cursor.atEnd(); @@ -706,6 +707,7 @@ GlobalLogWindow::GlobalLogWindow() GlobalLogWindow::~GlobalLogWindow() { + theGlobalLog = nullptr; } void GlobalLogWindow::doOutput(const QString &output) |