[rkward-cvs] SF.net SVN: rkward:[2891] trunk/rkward/rkward/core/robject.cpp

[tfry at users.sourceforge.net]

Revision: 2891
          http://rkward.svn.sourceforge.net/rkward/?rev=2891&view=rev
Author:   tfry
Date:     2010-06-22 11:53:35 +0000 (Tue, 22 Jun 2010)

Log Message:
-----------
Do not try to update a non-existing rownames object

Modified Paths:
--------------
    trunk/rkward/rkward/core/robject.cpp

Modified: trunk/rkward/rkward/core/robject.cpp
===================================================================
--- trunk/rkward/rkward/core/robject.cpp	2010-06-22 11:53:07 UTC (rev 2890)
+++ trunk/rkward/rkward/core/robject.cpp	2010-06-22 11:53:35 UTC (rev 2891)
@@ -320,11 +320,12 @@
 
 	type |= NeedDataUpdate;
 	if (isContainer ()) {
-		RObjectMap children = static_cast<RContainerObject*> (this)->childmap;
+	    RContainerObject* this_container = static_cast<RContainerObject*> (this);
+		RObjectMap children = this_container->childmap;
 		for (int i = children.size () - 1; i >= 0; --i) {
 			children[i]->markDataDirty ();
 		}
-		static_cast<RContainerObject*> (this)->rownames_object->markDataDirty ();
+		if (this_container->rownames_object) this_container->rownames_object->markDataDirty ();
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.