[rkward-cvs] SF.net SVN: rkward:[4348] trunk/rkward/rkward/core/renvironmentobject.cpp

[tfry at users.sourceforge.net]

Revision: 4348
          http://rkward.svn.sourceforge.net/rkward/?rev=4348&view=rev
Author:   tfry
Date:     2012-10-04 16:26:27 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
Object still needs to be updated, of course...

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

Modified: trunk/rkward/rkward/core/renvironmentobject.cpp
===================================================================
--- trunk/rkward/rkward/core/renvironmentobject.cpp	2012-10-02 16:19:15 UTC (rev 4347)
+++ trunk/rkward/rkward/core/renvironmentobject.cpp	2012-10-04 16:26:27 UTC (rev 4348)
@@ -138,11 +138,11 @@
 	// which ones are new in the list?
 	for (int i = current_symbols.count () - 1; i >= 0; --i) {
 		RObject *child = findChildByName (current_symbols[i]);
-		if (!child) {
-			child = createPendingChild (current_symbols[i], i, false, false);
+		if (!child) child = createPendingChild (current_symbols[i], i, false, false);
+		if (child->isPending ()) {
 			child->type -= RObject::Pending;	// HACK: Child is not actually pending: We've seen it!
+			child->updateFromR (chain);
 		}
-		if (child->isPending ()) child->updateFromR (chain);
 	}
 
 	RK_ASSERT ((debug_baseline + current_symbols.count ()) == childmap.size ());

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