[Gnash-commit] /srv/bzr/gnash/trunk r10698: Fix --max-advances to refer to SWF frame advances, not hear-beats

[Sandro Santilli]

------------------------------------------------------------
revno: 10698
committer: Sandro Santilli <address@hidden>
branch nick: gnash-head-backup
timestamp: Fri 2009-03-13 21:49:33 +0100
message:
  Fix --max-advances to refer to SWF frame advances, not hear-beats
modified:
  gui/gui.cpp

=== modified file 'gui/gui.cpp'
--- a/gui/gui.cpp       2009-03-12 10:14:31 +0000
+++ b/gui/gui.cpp       2009-03-13 20:49:33 +0000
@@ -911,17 +911,11 @@
 
 #ifndef REVIEW_ALL_FRAMES
        // Advance movie by one frame
-#ifdef GNASH_FPS_DEBUG
-       bool advanced = 
-#endif
-        m->advance();
+       bool advanced = m->advance();
 #else
        size_t cur_frame = m->getRootMovie()->get_current_frame();
        size_t tot_frames = m->getRootMovie()->get_frame_count();
-#ifdef GNASH_FPS_DEBUG
-       bool advanced = 
-#endif
-           m->advance();
+       bool advanced = m->advance();
        m->get_movie_definition()->ensure_frame_loaded(tot_frames);
        m->goto_frame(cur_frame+1);
        m->set_play_state(gnash::MovieClip::PLAY);
@@ -986,7 +980,7 @@
        }
 
     /// Quit if we've reached the advance limit.
-    if (_maxAdvances && (_advances++ > _maxAdvances))
+    if (_maxAdvances && advanced && (_advances++ > _maxAdvances))
     {
         quit();
     }