Check that objects still exist when dispatching events to them

diff --git a/source/io/eventdispatcher.cpp b/source/io/eventdispatcher.cpp
index f98474c227d4cc7e1fd8d1a2e03274a6f21c89d5..49b28ac78bf436997f74d2d8fecb740aebf47fb5 100644 (file)
--- a/source/io/eventdispatcher.cpp
+++ b/source/io/eventdispatcher.cpp
@@ -65,7 +65,8 @@ void EventDispatcher::dispatch()
 {
        const vector<Poller::PolledObject> &result = poller.get_result();
        for(vector<Poller::PolledObject>::const_iterator i=result.begin(); i!=result.end(); ++i)
-               i->object->event(i->events);
+               if(objects.count(Slot(*this, *i->object)))
+                       i->object->event(i->events);
 }