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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/09/18 14:25:58

Modified files:
        .              : ChangeLog 
        server         : dlist.cpp 

Log message:
                * server/dlist.cpp (unload): don't unload again already-unloaded
                  characters. Fixes the assertion failure in
                  action_execution_order_test12.sc.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4341&r2=1.4342
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.92&r2=1.93

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4341
retrieving revision 1.4342
diff -u -b -r1.4341 -r1.4342
--- ChangeLog   18 Sep 2007 10:30:39 -0000      1.4341
+++ ChangeLog   18 Sep 2007 14:25:57 -0000      1.4342
@@ -1,6 +1,12 @@
+2007-09-18 Sandro Santilli <address@hidden>
+
+       * server/dlist.cpp (unload): don't unload again already-unloaded
+         characters. Fixes the assertion failure in
+         action_execution_order_test12.sc.
+
 2007-09-18 Zou Lunkai <address@hidden>
 
-       * testsuite/misc-swfc.all/action _execution_order_test12.sc, 
Makefile.am:
+       * testsuite/misc-swfc.all/action_execution_order_test12.sc, Makefile.am:
          add new testcase, caught an assertion here. Disable it if it blocks 
your
          work.
        

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/dlist.cpp    13 Sep 2007 13:57:49 -0000      1.92
+++ server/dlist.cpp    18 Sep 2007 14:25:58 -0000      1.93
@@ -807,11 +807,20 @@
 
        testInvariant();
 
+       // Should we start looking from beginNonRemoved ?
+       // If I try, I get a failure in swfdec/gotoframe.swf
        for (iterator it = _charsByDepth.begin(),       itEnd = 
_charsByDepth.end(); it != itEnd; )
        {
                // make a copy
                DisplayItem di = *it;
 
+               // skip if already unloaded
+               if ( di->isUnloaded() )
+               {
+                       ++it;
+                       continue;
+               }
+
                if ( ! di->unload() ) // no event handler queued, we remove
                {
                        it = _charsByDepth.erase(it);