[rkward-cvs] SF.net SVN: rkward:[2808] trunk/rkward/rkward/core/rkvariable.cpp

[tfry at users.sourceforge.net]

Revision: 2808
          http://rkward.svn.sourceforge.net/rkward/?rev=2808&view=rev
Author:   tfry
Date:     2010-03-23 11:09:47 +0000 (Tue, 23 Mar 2010)

Log Message:
-----------
Don't remove pending flag too early (fix for r2790)

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

Modified: trunk/rkward/rkward/core/rkvariable.cpp
===================================================================
--- trunk/rkward/rkward/core/rkvariable.cpp	2010-03-22 16:57:43 UTC (rev 2807)
+++ trunk/rkward/rkward/core/rkvariable.cpp	2010-03-23 11:09:47 UTC (rev 2808)
@@ -234,7 +234,6 @@
 	if (!data) {
 		allocateEditData ();
 		if (!isPending ()) updateDataFromR (0);
-		else (type -= Pending);
 	}
 	++(data->num_listeners);
 }
@@ -295,6 +294,8 @@
 	delete data->value_labels;
 	delete data;
 	data = 0;
+
+	if (isPending ())  (type -= Pending);
 }
 
 void RKVariable::updateDataFromR (RCommandChain *chain) {


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