From 04c3faec6a079e1ad7b5722ef7bcbc2d590cad77 Mon Sep 17 00:00:00 2001 From: "Jerry (Xinyu Hou)" Date: Thu, 9 Jul 2015 17:14:09 -0700 Subject: [PATCH] Revert "Cleared buffer on send instead of write #4721" This reverts commit 7614a21aac7f24c90e518f38d4931d19602ad6c8. --- src/lib/ipc/IpcLogOutputter.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib/ipc/IpcLogOutputter.cpp b/src/lib/ipc/IpcLogOutputter.cpp index 276e0a941c..cf0fa03c55 100644 --- a/src/lib/ipc/IpcLogOutputter.cpp +++ b/src/lib/ipc/IpcLogOutputter.cpp @@ -95,6 +95,13 @@ IpcLogOutputter::show(bool showIfEmpty) bool IpcLogOutputter::write(ELevel, const char* text) { + if (!m_ipcServer.hasClients(kIpcClientGui)) { + if (!m_buffer.empty()) { + m_buffer.clear(); + } + return true; + } + // ignore events from the buffer thread (would cause recursion). if (m_bufferThread != nullptr && Thread::getCurrentThread().getID() == m_bufferThreadId) { @@ -185,9 +192,6 @@ void IpcLogOutputter::sendBuffer() { if (m_buffer.empty() || !m_ipcServer.hasClients(kIpcClientGui)) { - if (!m_buffer.empty()) { - m_buffer.clear(); - } return; }