CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 07/09/27 08:14:27
Modified files:
. : ChangeLog
server : movie_root.cpp
Log message:
* server/movie_root.cpp: move level0->restart()
to avoid assertion failure.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4438&r2=1.4439
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.97&r2=1.98
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4438
retrieving revision 1.4439
diff -u -b -r1.4438 -r1.4439
--- ChangeLog 27 Sep 2007 08:10:17 -0000 1.4438
+++ ChangeLog 27 Sep 2007 08:14:26 -0000 1.4439
@@ -1,3 +1,8 @@
+2007-09-27 Benjamin Wolsey <[EMAIL PROTECTED]>
+
+ * server/movie_root.cpp: move level0->restart()
+ to avoid assertion failure.
+
2007-09-27 Sandro Santilli <[EMAIL PROTECTED]>
* server/vm/ActionExec.cpp (call operator): re-enable
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- server/movie_root.cpp 23 Sep 2007 08:48:17 -0000 1.97
+++ server/movie_root.cpp 27 Sep 2007 08:14:27 -0000 1.98
@@ -197,16 +197,16 @@
// wipe out all levels
_movies.clear();
+ // Add level0 back in place
+ // NOTE: we don't call setLevel to avoid calling
::stagePlacementCallback again
+ _movies[0] = level0;
+
// Restart the level0 movie
// TODO: instead, take it's definition and re-instantiate
// a new movie here ! The only problem would be re-setting
// externally set variables
level0->restart();
- // Add level0 back in place
- // NOTE: we don't call setLevel to avoid calling
::stagePlacementCallback again
- _movies[0] = level0;
-
// Process actions queued by restart/stagePlacementCallback
processActionQueue();
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
