[Gnash-commit] gnash/server Sprite.cpp

[strk]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     strk <address@hidden>   06/02/01 14:40:12

Modified files:
        server         : Sprite.cpp 

Log message:
        Fixed bug in _parent accessor function: undefined is a correct value 
for a root movie

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Sprite.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnash/server/Sprite.cpp
diff -u gnash/server/Sprite.cpp:1.6 gnash/server/Sprite.cpp:1.7
--- gnash/server/Sprite.cpp:1.6 Tue Jan 31 16:45:38 2006
+++ gnash/server/Sprite.cpp     Wed Feb  1 14:40:12 2006
@@ -537,9 +537,17 @@
                }
                case M_PARENT:
                {
-                       assert(dynamic_cast<as_object_interface*>(m_parent));
-                       
val->set_as_object_interface(static_cast<as_object_interface*>(m_parent));
-                       return true;
+                       if (m_parent==NULL)
+                       // _parent is undefined for root movies
+                       {
+                               return false;
+                       }
+                       else
+                       {
+                               
assert(dynamic_cast<as_object_interface*>(m_parent));
+                               
val->set_as_object_interface(static_cast<as_object_interface*>(m_parent));
+                               return true;
+                       }
                }
                case M_ONLOAD:
                {