[Gnash-commit] gnash ./ChangeLog gui/sdl.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/22 18:23:06

Modified files:
        .              : ChangeLog 
        gui            : sdl.cpp 

Log message:
        * gui/sdl.cpp: fixed bug in SDL gui preventing movie advances.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.368&tr2=1.369&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/sdl.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.368 gnash/ChangeLog:1.369
--- gnash/ChangeLog:1.368       Mon May 22 17:30:38 2006
+++ gnash/ChangeLog     Mon May 22 18:23:06 2006
@@ -1,5 +1,6 @@
 2006-05-22 Sandro Santilli <address@hidden>
 
+       * gui/sdl.cpp: fixed bug in SDL gui preventing movie advances.
        * configure.ac: abort with an error at configure time if gui==gtk 
        and libgtkgl is not found.
 
Index: gnash/gui/sdl.cpp
diff -u gnash/gui/sdl.cpp:1.7 gnash/gui/sdl.cpp:1.8
--- gnash/gui/sdl.cpp:1.7       Sat May 13 05:45:27 2006
+++ gnash/gui/sdl.cpp   Mon May 22 18:23:06 2006
@@ -89,7 +89,7 @@
       if (_timeout && SDL_GetTicks() >= _timeout) {
         break;
       }
-      _func(this);
+      if ( _func ) _func(this);
 
       for (unsigned int i=0; i < _interval; i++) {
         SDL_PollEvent(&event);
@@ -281,7 +281,8 @@
 void
 SDLGui::setCallback(callback_t func, unsigned int interval)
 {
-    _func = func;
+    //_func = func;
+    _func = advance_movie;
     _interval = interval;
 }