oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

event/Loop: remove bogus "!quit" assertion

Browse Source 
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.
This commit is contained in:
Max Kellermann 2014-01-04 17:05:01 +01:00
parent 0f9ef2506f
commit 19424e95db
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/event/Loop.cxx
View File

@ -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);
}
}