From c7f013e7e5efa95ed63c38f60cf6a09f53a246ef Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 6 Sep 2020 14:51:59 +0100 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20wipe=20startup=20message=20on?= =?UTF-8?q?=20pausing=20logging.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simgear/debug/logstream.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/simgear/debug/logstream.cxx b/simgear/debug/logstream.cxx index 0ccb631e..5610973c 100644 --- a/simgear/debug/logstream.cxx +++ b/simgear/debug/logstream.cxx @@ -402,6 +402,13 @@ public: ~LogStreamPrivate() { removeCallbacks(); + + // house-keeping, avoid leak warnings if we exit before disabling + // startup logging + { + std::lock_guard g(m_lock); + clearStartupEntriesLocked(); + } } std::mutex m_lock; @@ -489,13 +496,6 @@ public: free(const_cast(entry.file)); } } // of main thread loop - - // house-keeping, avoid leak warnings if we exit before disabling - // startup logging - { - std::lock_guard g(m_lock); - clearStartupEntriesLocked(); - } } bool stop()