event/IdleMonitor: cancel in destructor only if active

Debug-mode workaround for bogus assertion failure.

event/IdleMonitor: cancel in destructor only if active
617090cf · Max Kellermann · a9e604d5 · 617090cf
Commit 617090cf authored Jan 06, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

IdleMonitor.hxx src/event/IdleMonitor.hxx +6 -1

No files found.
--- a/src/event/IdleMonitor.hxx
+++ b/src/event/IdleMonitor.hxx
@@ -45,7 +45,12 @@ public:
 		:loop(_loop), active(false) {}

 	~IdleMonitor() {
-		Cancel();
+#ifndef NDEBUG
+		/* this check is redundant, it is only here to avoid
+		   the assertion in Cancel() */
+		if (IsActive())
+#endif
+			Cancel();
 	}

 	EventLoop &GetEventLoop() const {