From 8df3e2516fa416e1c778d20f7ad203d68fb6afa9 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Sun, 26 May 2019 17:53:03 +0200 Subject: [PATCH] CEventLoop: Make it possible to determine running/quit state without using exec() ... by removing a redundant member that nothing uses (running), and exposing whether or not quit has been requested. --- LibCore/CEventLoop.cpp | 2 -- LibCore/CEventLoop.h | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/LibCore/CEventLoop.cpp b/LibCore/CEventLoop.cpp index 755434a952f..4537efb5afa 100644 --- a/LibCore/CEventLoop.cpp +++ b/LibCore/CEventLoop.cpp @@ -87,8 +87,6 @@ private: int CEventLoop::exec() { CEventLoopPusher pusher(*this); - - m_running = true; for (;;) { if (m_exit_requested) return m_exit_code; diff --git a/LibCore/CEventLoop.h b/LibCore/CEventLoop.h index b39812bba06..31a0d21a488 100644 --- a/LibCore/CEventLoop.h +++ b/LibCore/CEventLoop.h @@ -34,7 +34,7 @@ public: static CEventLoop& main(); static CEventLoop& current(); - bool running() const { return m_running; } + bool was_exit_requested() const { return m_exit_requested; } static int register_timer(CObject&, int milliseconds, bool should_reload); static bool unregister_timer(int timer_id); @@ -65,7 +65,6 @@ private: Vector m_queued_events; - bool m_running { false }; bool m_exit_requested { false }; int m_exit_code { 0 };