commit 234a532c0a126cc9e47d991d41bcd7bf73201229
author Junxiao Shi <git@mail1.yoursunny.com> Thu Jan 30 22:40:48 2014 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Thu Jan 30 22:40:48 2014 -0700
tree 36dfe2ac8c3463ef9af34e41f4f49fbc6d8e3e8f
parent d3c792f95cb53118918da4fb6b723a8dc8f44904

core: Scheduler::cancelEvent allows empty EventId

refs #1176

Change-Id: I80f10ed8026d64b46b4634ced9278f145f54c4a7

daemon/core/scheduler.cpp

diff --git a/daemon/core/scheduler.cpp b/daemon/core/scheduler.cpp
index f9f9996..c72e279 100644
--- a/daemon/core/scheduler.cpp
+++ b/daemon/core/scheduler.cpp
@@ -109,8 +109,8 @@
 void
 Scheduler::cancelEvent(const EventId& eventId)
 {
-  if (!eventId->isValid())
-    return; // event already fired or cancelled
+  if (!static_cast<bool>(eventId) || !eventId->isValid())
+    return; // event empty, already fired, or cancelled
   
   if (static_cast<EventQueue::iterator>(*eventId) != m_scheduledEvent) {
     m_events.erase(*eventId);