[Gnash-commit] gnash/server movie_root.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/09 07:35:12

Modified files:
        server         : movie_root.cpp 

Log message:
        add more info in action catchers about which function cought them

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.107&r2=1.108

Patches:
Index: movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- movie_root.cpp      5 Oct 2007 08:13:29 -0000       1.107
+++ movie_root.cpp      9 Oct 2007 07:35:11 -0000       1.108
@@ -147,7 +147,7 @@
        }
        catch (ActionLimitException& al)
        {
-               log_error(_("ActionLimits hit: %s"), al.what());
+               log_error(_("ActionLimits hit during setRootMovie: %s. 
Disabling scripts"), al.what());
                disableScripts();
                clearActionQueue();
        }
@@ -743,7 +743,7 @@
        }
        catch (ActionLimitException& al)
        {
-               log_error(_("ActionLimits hit: %s"), al.what());
+               log_error(_("ActionLimits hit during advance: %s. Disabling 
scripts"), al.what());
                disableScripts();
                clearActionQueue();
        }
@@ -1362,6 +1362,7 @@
 void
 movie_root::advanceLiveChar(boost::intrusive_ptr<character> ch, float 
delta_time)
 {
+
        if ( ! ch->isUnloaded() )
        {
 #ifdef GNASH_DEBUG
@@ -1379,6 +1380,7 @@
 void
 movie_root::advanceLiveChars(float delta_time)
 {
+
 #ifdef GNASH_DEBUG
        log_debug("---- movie_root::advance: %d live characters in the global 
list", _liveChars.size());
 #endif