[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/02/08 07:46:08

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
        (on_event): skip seeking for user-defined onLoad handler only if all all
        clip events (not just the onLoad one) are undefined.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5590&r2=1.5591
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.462&r2=1.463

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5590
retrieving revision 1.5591
diff -u -b -r1.5590 -r1.5591
--- ChangeLog   7 Feb 2008 21:55:25 -0000       1.5590
+++ ChangeLog   8 Feb 2008 07:46:05 -0000       1.5591
@@ -1,3 +1,9 @@
+2008-02-08 Sandro Santilli <address@hidden>
+
+       * server/sprite_instance.cpp (on_event): skip seeking for user-defined
+         onLoad handler only if all all clip events (not just the onLoad one)
+         are undefined.
+
 2008-02-07  Rob Savoye  <address@hidden>
 
        * packaging/install-gnash.sh: Add file finding function, so we

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -b -r1.462 -r1.463
--- server/sprite_instance.cpp  31 Jan 2008 14:15:57 -0000      1.462
+++ server/sprite_instance.cpp  8 Feb 2008 07:46:07 -0000       1.463
@@ -2525,14 +2525,14 @@
   //
   if ( id.m_id == event_id::LOAD )
   {
-    if ( get_parent() && ! called )
+    if ( get_parent() && get_event_handlers().empty() )
     {
 #ifdef GNASH_DEBUG
-      log_debug("Sprite %s won't check for user-defined LOAD event (didn't 
have a clipLoad event defined)", getTarget().c_str());
+      log_debug("Sprite %s won't check for user-defined LOAD event (had no 
clip events defined)", getTarget().c_str());
       testInvariant();
 #endif
-      // FIXME: shouldn't we return 'called' ?
-      return false;
+      
+      return called;
     }
   }