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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/23 13:50:52

Modified files:
        .              : ChangeLog 
        server         : movie_root.cpp 

Log message:
        (clear): remove key/mouse listeners.
        Fixes an assertion failure running levels.swf with PARANOIA_LEVEL > 1.
        Didn't actually check if load into _level0 is supposed to
        drop key events or not.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6356&r2=1.6357
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.180&r2=1.181

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6356
retrieving revision 1.6357
diff -u -b -r1.6356 -r1.6357
--- ChangeLog   23 Apr 2008 13:29:53 -0000      1.6356
+++ ChangeLog   23 Apr 2008 13:50:51 -0000      1.6357
@@ -1,5 +1,10 @@
 2008-04-23 Sandro Santilli <address@hidden>
 
+       * server/movie_root.cpp (clear): remove key/mouse listeners. Fixes
+         an assertion failure running levels.swf with PARANOIA_LEVEL > 1.
+
+2008-04-23 Sandro Santilli <address@hidden>
+
        * server/movie_root.{cpp,h}: add a cleanupAndCollect() private method
          so we don't forget to clean key/mouse listeners before invoking
          the garbage collector. Fixes a few assertion failures with

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- server/movie_root.cpp       23 Apr 2008 13:29:54 -0000      1.180
+++ server/movie_root.cpp       23 Apr 2008 13:50:52 -0000      1.181
@@ -421,7 +421,9 @@
        // remove all intervals
        clearIntervalTimers();
 
-       // TODO: remove key/mouse listeners
+       // remove key/mouse listeners
+       m_key_listeners.clear();
+       m_mouse_listeners.clear();
 
 #ifdef GNASH_USE_GC
        // Run the garbage collector again