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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/10 23:07:34

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
                * server/sprite_instance.cpp (goto_frame): always set
                _callingFrameActions to false before calling restoreDisplayList.
                Fixes an assertion failure playing make_sleep.swf.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4826&r2=1.4827
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.379&r2=1.380

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4826
retrieving revision 1.4827
diff -u -b -r1.4826 -r1.4827
--- ChangeLog   10 Nov 2007 18:07:13 -0000      1.4826
+++ ChangeLog   10 Nov 2007 23:07:33 -0000      1.4827
@@ -1,5 +1,11 @@
 2007-11-10 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (goto_frame): always set
+       _callingFrameActions to false before calling restoreDisplayList.
+       Fixes an assertion failure playing make_sleep.swf.
+
+2007-11-10 Sandro Santilli <address@hidden>
+
        * server/shape.{cpp,h}: add new poinOnCurve and squareDistancePtCurve
          static methods for gnash::edge, have path::withinSquareDistance
          use them for curves.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -b -r1.379 -r1.380
--- server/sprite_instance.cpp  10 Nov 2007 11:51:43 -0000      1.379
+++ server/sprite_instance.cpp  10 Nov 2007 23:07:34 -0000      1.380
@@ -2643,9 +2643,14 @@
     if (target_frame_number < m_current_frame)
     // Go backward to a previous frame
     {
+       // NOTE: just in case we're being called by code in a called frame
+       //       we'll backup and resume the _callingFrameActions flag
+       bool callingFrameActionsBackup = _callingFrameActions;
+       _callingFrameActions = false;
         // restoreDisplayList takes care of properly setting the 
m_current_frame variable
         restoreDisplayList(target_frame_number);
         assert(m_current_frame == target_frame_number);
+       _callingFrameActions = callingFrameActionsBackup;
 
        // <UdoG> current design is sub-optimal because it causes unnecessary 
        // redraw. Consider a static graphic that stays at it's position all