[Gnash-commit] gnash ChangeLog server/button_character_instanc...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/10 16:18:38

Modified files:
        .              : ChangeLog 
        server         : button_character_instance.cpp 

Log message:
                * server/button_character_instance.cpp (on_event): don't 
require a
                  button's parent to be a sprite. Fixes bug #20436.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3701&r2=1.3702
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.51&r2=1.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3701
retrieving revision 1.3702
diff -u -b -r1.3701 -r1.3702
--- ChangeLog   10 Jul 2007 16:16:00 -0000      1.3701
+++ ChangeLog   10 Jul 2007 16:18:38 -0000      1.3702
@@ -1,5 +1,7 @@
 2007-07-10 Sandro Santilli <address@hidden>
 
+       * server/button_character_instance.cpp (on_event): don't require a
+         button's parent to be a sprite. Fixes bug #20436.
        * server/parser/button_character_def.cpp: verbose button_record
          parsing.
        * libbase/utility.h (typeName): arg by *const* ref.

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/button_character_instance.cpp        1 Jul 2007 10:54:21 -0000       
1.51
+++ server/button_character_instance.cpp        10 Jul 2007 16:18:38 -0000      
1.52
@@ -357,10 +357,7 @@
 
        bool called = false;
 
-       sprite_instance* parent = get_parent()->to_movie();
-       assert ( parent );
-
-       // Add appropriate actions to the movie's execute list...
+       // Add appropriate actions to the global action list ...
        // TODO: should we execute immediately instead ?
        for (size_t i = 0, ie=m_def->m_button_actions.size(); i<ie; ++i)
        {
@@ -374,7 +371,6 @@
                        for (size_t j=0, je=ba.m_actions.size(); j<je; ++j)
                        {
                                
VM::get().getRoot().pushAction(*(ba.m_actions[j]), 
boost::intrusive_ptr<character>(this));
-                               //parent->add_action_buffer(ba.m_actions[j]);
                        }
                        called = true;
                }