[Gnash-commit] gnash ChangeLog server/button_character_instanc...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/22 13:12:10

Modified files:
        .              : ChangeLog 
        server         : button_character_instance.cpp 

Log message:
        (on_event, on_button_event): ignore events if unloaded.  Fixes bug 
#22982.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6344&r2=1.6345
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.100&r2=1.101

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6344
retrieving revision 1.6345
diff -u -b -r1.6344 -r1.6345
--- ChangeLog   22 Apr 2008 12:58:02 -0000      1.6344
+++ ChangeLog   22 Apr 2008 13:12:09 -0000      1.6345
@@ -1,5 +1,11 @@
 2008-04-22 Sandro Santilli <address@hidden>
 
+       * server/button_character_instance.cpp (on_event,
+         on_button_event): ignore events if unloaded.
+         Fixes bug #22982.
+
+2008-04-22 Sandro Santilli <address@hidden>
+
        * server/dlist.h, server/movie_root.{cpp,h}: set
          GNASH_PARANOIA_LEVEL if not already set, use it
          to engage expensive assertions when > 1.

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/button_character_instance.cpp        22 Apr 2008 09:12:45 -0000      
1.100
+++ server/button_character_instance.cpp        22 Apr 2008 13:12:09 -0000      
1.101
@@ -350,6 +350,15 @@
 bool
 button_character_instance::on_event(const event_id& id)
 {
+       if ( isUnloaded() )
+       {
+               // We dont' respond to events while unloaded
+               // See bug #22982
+               log_debug("Button %s received %s event while unloaded: ignored",
+                       getTarget(), id.get_function_name());
+               return false; 
+       }
+
        // We only respond keypress events
        if ( id.m_id != event_id::KEY_PRESS ) return false;
 
@@ -457,6 +466,15 @@
 void
 button_character_instance::on_button_event(const event_id& event)
 {
+       if ( isUnloaded() )
+       {
+               // We dont' respond to events while unloaded
+               // See bug #22982
+               log_debug("Button %s received %s button event while unloaded: 
ignored",
+                       getTarget(), event.get_function_name());
+               return;
+       }
+
        e_mouse_state new_state = m_mouse_state;
   
        // Set our mouse state (so we know how to render).