[rkward-cvs] SF.net SVN: rkward:[4441] trunk/rkward/rkward/plugin/rkoptionset.cpp

[tfry at users.sourceforge.net]

Revision: 4441
          http://rkward.svn.sourceforge.net/rkward/?rev=4441&view=rev
Author:   tfry
Date:     2012-11-21 19:00:29 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Fix lookup of keycolumn

Modified Paths:
--------------
    trunk/rkward/rkward/plugin/rkoptionset.cpp

Modified: trunk/rkward/rkward/plugin/rkoptionset.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkoptionset.cpp	2012-11-21 18:57:37 UTC (rev 4440)
+++ trunk/rkward/rkward/plugin/rkoptionset.cpp	2012-11-21 19:00:29 UTC (rev 4441)
@@ -114,12 +114,14 @@
 	keycolumn = 0;
 	QString keycol = xml->getStringAttribute (element, "keycolumn", QString (), DL_DEBUG);
 	if (!keycol.isEmpty ()) {
+		keycolumn = static_cast<RKComponentPropertyStringList*> (child_map.value (keycol));
 		if (!column_map.contains (keycolumn)) {
 			RK_DO (qDebug ("optionset does not contain a column named %s. Falling back to manual insertion mode", qPrintable (keycol)), PLUGIN, DL_ERROR);
+			keycolumn = 0;
 		} else if (!column_map[keycolumn].external) {
 			RK_DO (qDebug ("keycolumn (%s) is not marked as external. Falling back to manual insertion mode", qPrintable (keycol)), PLUGIN, DL_ERROR);
+			keycolumn = 0;
 		} else {
-			keycolumn = static_cast<RKComponentPropertyStringList*> (child_map.value (keycol));
 			updating = true;
 			keycolumn->setValue (KEYCOLUMN_UNINITIALIZED_VALUE);
 			updating = false;

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