event/Call: invoke function directly if the EventLoop is dead

Works around a deadlock bug which happens when waiting for an EventLoop which isn't running anymore.

event/Call: invoke function directly if the EventLoop is dead
3fd9a86f · Max Kellermann · ce68701c · 3fd9a86f
Commit 3fd9a86f authored Jan 29, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Call.cxx src/event/Call.cxx +1 -1

No files found.
--- a/src/event/Call.cxx
+++ b/src/event/Call.cxx
@@ -81,7 +81,7 @@ private:
 void
 BlockingCall(EventLoop &loop, std::function<void()> &&f)
 {
-	if (loop.IsInside()) {
+	if (loop.IsDead() || loop.IsInside()) {
 		/* we're already inside the loop - we can simply call
 		   the function */
 		f();