event/Loop: remove bogus "!quit" assertion

Commit 1f119597 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.

event/Loop: remove bogus "!quit" assertion
19424e95 · Max Kellermann · 0f9ef250 · 19424e95
Commit 19424e95 authored Jan 04, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

Loop.cxx src/event/Loop.cxx +3 -5

No files found.
--- 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);
 			}
 		}