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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/28 16:53:27

Modified files:
        .              : ChangeLog 
        gui            : Player.cpp 

Log message:
                * gui/Player.cpp: fix handling of the -d switch.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1805&r2=1.1806
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1805
retrieving revision 1.1806
diff -u -b -r1.1805 -r1.1806
--- ChangeLog   28 Nov 2006 16:20:27 -0000      1.1805
+++ ChangeLog   28 Nov 2006 16:53:26 -0000      1.1806
@@ -1,5 +1,9 @@
 2006-11-28 Sandro Santilli <address@hidden>
 
+       * gui/Player.cpp: fix handling of the -d switch.
+
+2006-11-28 Sandro Santilli <address@hidden>
+
        * server/character.cpp (do_mouse_drag): indentation
        * server/character.h (drag_state): documented
          coordinate space for drag bounds.

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- gui/Player.cpp      28 Nov 2006 13:02:48 -0000      1.34
+++ gui/Player.cpp      28 Nov 2006 16:53:26 -0000      1.35
@@ -158,7 +158,14 @@
         dbglogfile.setVerbosity();
     }
     
-    if (rcfile.getTimerDelay() > 0) {
+    // If a delay was not specified yet use
+    // any eventual setting for it found in 
+    // the RcInitFile
+    //
+    // TODO: we should remove all uses of the rcfile
+    //       from Player class..
+    //
+    if (!delay && rcfile.getTimerDelay() > 0) {
         delay = rcfile.getTimerDelay();
         dbglogfile << "Timer delay set to " << delay << "milliseconds" << endl;
     }    
@@ -237,7 +244,6 @@
 {
     
        bool background = true;
-       unsigned int  delay = 0;
 
        assert(tu_types_validate());