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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/06/05 18:35:42

Modified files:
        .              : ChangeLog 
        server         : movie_root.cpp 

Log message:
                * server/movie_root.cpp: not disabling scripts in setMovieRoot 
is
                  wrong (tested in swfdec testsuite) and wasn't supposed to be
                  committed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6830&r2=1.6831
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.203&r2=1.204

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6830
retrieving revision 1.6831
diff -u -b -r1.6830 -r1.6831
--- ChangeLog   5 Jun 2008 14:39:02 -0000       1.6830
+++ ChangeLog   5 Jun 2008 18:35:41 -0000       1.6831
@@ -1,5 +1,11 @@
 2008-06-05 Benjamin Wolsey <address@hidden>
 
+       * server/movie_root.cpp: not disabling scripts in setMovieRoot is
+         wrong (tested in swfdec testsuite) and wasn't supposed to be
+         committed.
+
+2008-06-05 Benjamin Wolsey <address@hidden>
+
        * server/dlist.cpp: use list::remove_if() instead of std::remove_if()
          on a list.
        * server/movie_root.cpp: use list::remove_if() rather than iterating

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -b -r1.203 -r1.204
--- server/movie_root.cpp       5 Jun 2008 14:39:03 -0000       1.203
+++ server/movie_root.cpp       5 Jun 2008 18:35:42 -0000       1.204
@@ -195,13 +195,9 @@
        }
        catch (ActionLimitException& al)
        {
-               //log_error(_("ActionLimits hit during setRootMovie: %s. "
-               //                      "Disabling scripts"), al.what());
-               //disableScripts();
-
-        // The PP doesn't disable scripts here, but rather abandons processing
-        // carries on.
-               log_error(_("ActionLimits hit during setRootMovie: %s."), 
al.what());
+               log_error(_("ActionLimits hit during setRootMovie: %s. "
+                                       "Disabling scripts"), al.what());
+               disableScripts();
                clearActionQueue();
        }