[Gnash-commit] gnash ChangeLog server/parser/button_character_...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/13 00:26:50

Modified files:
        .              : ChangeLog 
        server/parser  : button_character_def.cpp 

Log message:
        (readDefineButton2): don't attempt to read button actions if there are 
none..

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5153&r2=1.5154
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5153
retrieving revision 1.5154
diff -u -b -r1.5153 -r1.5154
--- ChangeLog   12 Dec 2007 23:56:28 -0000      1.5153
+++ ChangeLog   13 Dec 2007 00:26:49 -0000      1.5154
@@ -1,3 +1,8 @@
+2007-12-12 Sandro Santilli <address@hidden>
+
+       * server/parser/button_character_def.cpp (readDefineButton2):
+         don't attempt to read button actions if there are none..
+
 2007-12-12  Rob Savoye  <address@hidden>
 
        * configure.ac: Disable LIRC by default. Link cygnalrc test file

Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/parser/button_character_def.cpp      12 Dec 2007 23:49:28 -0000      
1.20
+++ server/parser/button_character_def.cpp      13 Dec 2007 00:26:50 -0000      
1.21
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: button_character_def.cpp,v 1.20 2007/12/12 23:49:28 strk Exp $ */
+/* $Id: button_character_def.cpp,v 1.21 2007/12/13 00:26:50 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
 
@@ -326,6 +326,8 @@
                }
        }
 
+       if ( button_2_action_offset )
+       {
        in->set_position(next_action_pos);
 
        // Read Button2ActionConditions
@@ -357,6 +359,7 @@
                // seek to next action.
                in->set_position(next_action_pos);
        }
+       }
 
        // detect min/max layer number
        m_min_layer=0;