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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/17 16:21:03

Modified files:
        .              : ChangeLog 
        server         : movie_root.cpp 

Log message:
        catch ActionLimit exceptions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5949&r2=1.5950
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.170&r2=1.171

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5949
retrieving revision 1.5950
diff -u -b -r1.5949 -r1.5950
--- ChangeLog   17 Mar 2008 15:58:08 -0000      1.5949
+++ ChangeLog   17 Mar 2008 16:21:01 -0000      1.5950
@@ -1,3 +1,8 @@
+2008-03-17 Sandro Santilli <address@hidden>
+
+       * server/movie_root.cpp (fire_mouse_event): catch ActionLimit
+         exceptions.
+
 2008-03-17 Benjamin Wolsey <address@hidden>
 
        * doc/C/refmanual/logging.xml: update logging docs.

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- server/movie_root.cpp       14 Mar 2008 16:22:08 -0000      1.170
+++ server/movie_root.cpp       17 Mar 2008 16:21:02 -0000      1.171
@@ -847,7 +847,17 @@
 
     // FIXME: need_redraw might also depend on actual
     //        actions execution (consider updateAfterEvent).
+
+    try
+    {
     processActionQueue();
+    }
+    catch (ActionLimitException& al)
+    {
+        log_error(_("ActionLimits hit during mouse event processing: %s. 
Disabling scripts"), al.what());
+        disableScripts();
+        clearActionQueue();
+    }
 
     return need_redraw;