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

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/12/12 03:23:30

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
        * server/sprite_instance.cpp: don't restart an unloaded character, 
          fix bug#21754.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5135&r2=1.5136
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.408&r2=1.409

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5135
retrieving revision 1.5136
diff -u -b -r1.5135 -r1.5136
--- ChangeLog   11 Dec 2007 19:23:49 -0000      1.5135
+++ ChangeLog   12 Dec 2007 03:23:29 -0000      1.5136
@@ -1,3 +1,8 @@
+2007-12-12 Zou Lunkai <address@hidden>
+
+       * server/sprite_instance.cpp: don't restart an unloaded character, 
+         fix bug#21754.
+         
 2007-12-11 Sandro Santilli <address@hidden>
 
        * server/as_function.cpp: don't set function prototypes

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -b -r1.408 -r1.409
--- server/sprite_instance.cpp  10 Dec 2007 20:17:17 -0000      1.408
+++ server/sprite_instance.cpp  12 Dec 2007 03:23:30 -0000      1.409
@@ -3199,11 +3199,18 @@
                
 void sprite_instance::restart()
 {
+// see Whack-a-doc.swf, we tried to restart an unloaded character.
+// It shouldn't happen anyway.
+// TODO: drop this function.
+
        // Stop all sounds
        media::sound_handler* sh = get_sound_handler();
        if (sh != NULL) sh->stop_all_sounds();
 
-       restoreDisplayList(0); // seems OK to me.
+       if( ! isUnloaded() )
+       {
+               restoreDisplayList(0); 
+       }
 
        m_play_state = PLAY;
 }