From 19424e95dba6ae2b25733a48994f3781624c9c2e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 4 Jan 2014 17:05:01 +0100 Subject: event/Loop: remove bogus "!quit" assertion Commit 1f11959 allowed modifying the "quit" attribute from any thread, and thus the assertion may fail spuriously. This assertion is too strict for the relaxed use of "quit". Let's remove it and move the "quit" check to before the SockedMonitor::Dispatch() call. --- src/event/Loop.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/event/Loop.cxx b/src/event/Loop.cxx index e2f021016..06e1499e7 100644 --- a/src/event/Loop.cxx +++ b/src/event/Loop.cxx @@ -165,17 +165,15 @@ EventLoop::Run() now_ms = ::MonotonicClockMS(); - assert(!quit); - /* invoke sockets */ for (int i = 0; i < poll_result.GetSize(); ++i) { auto events = poll_result.GetEvents(i); if (events != 0) { - auto m = (SocketMonitor *)poll_result.GetObject(i); - m->Dispatch(events); - if (quit) break; + + auto m = (SocketMonitor *)poll_result.GetObject(i); + m->Dispatch(events); } } -- cgit v1.2.3