[Adonthell-commits] CVS: adonthell/src map_event_handler.cc,1.3,1.4

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv31043

Modified Files:
        map_event_handler.cc 
Log Message:
FIXED crash when map_event used up it's repeat-count

Index: map_event_handler.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/map_event_handler.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** map_event_handler.cc        18 Aug 2002 19:53:17 -0000      1.3
--- map_event_handler.cc        18 Aug 2002 22:34:35 -0000      1.4
***************
*** 29,47 ****
  void map_event_handler::raise_event (const event* e)
  {
!     vector<event*>::iterator j;
!     
!     // As long as matching events are in the list
!     for (vector<event*>::iterator i = Events.begin (); i != Events.end ();)
      {
!         j = i;
!         j++;
          
!         if ((*i)->equals (e))
!             // execute them. Note that events that use up their repeat
!             // count are automatically deleted and unregistered.
!             (*i)->execute (e);
!     
!         i = j;    
      }
      return;
  }
--- 29,44 ----
  void map_event_handler::raise_event (const event* e)
  {
!     // we have to iterate back to front as executing an event might
!     // erase it from the vector. This invalidates any iterators pointing
!     // _after_ the deleted element.
!     for (vector<event*>::iterator i = Events.end (); i > Events.begin ();)
      {
!         i--;
          
!         // if the events match, execute them. Note that events that use up
!         // their repeat count are automatically deleted and unregistered.
!         if ((*i)->equals (e)) (*i)->execute (e);
      }
+     
      return;
  }