[rkward-cvs] SF.net SVN: rkward-code:[4741] trunk/rkward

[tfry at users.sf.net]

Revision: 4741
          http://sourceforge.net/p/rkward/code/4741
Author:   tfry
Date:     2013-05-06 11:52:51 +0000 (Mon, 06 May 2013)
Log Message:
-----------
Really skip removed pluginmaps

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2013-05-03 16:15:11 UTC (rev 4740)
+++ trunk/rkward/ChangeLog	2013-05-06 11:52:51 UTC (rev 4741)
@@ -1,5 +1,7 @@
+- Fixed: potential crash when a previously installed pluginmap is not longer readable
 - New plugin element <valueslot> for selecting arbitrary string values (otherwise almost identical to <varslot>)
 	TODO: document, complement with valueselector (sort of pointless without)
+	      valueslot / varslot: If source-spec contains a dot, don't append "selected" -> more flexible input
 - <varslots> can be set to accept the same object several times. Used in scatterplot plugin.
 - New R function rk.embed.device() for manually embedding graphics devices in RKWard
 - Fixed: R backend would exit immediately, without meaningful error message, if there is an error in .Rprofile (or Rprofile.site)

Modified: trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp	2013-05-03 16:15:11 UTC (rev 4740)
+++ trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp	2013-05-06 11:52:51 UTC (rev 4741)
@@ -339,16 +339,16 @@
 		if (!info.isReadable ()) {
 			known_plugin_maps.removeAt (i);
 			--i;
-		} else {
-			if (inf.active) any_active_pluginmap = true;
-			if ((default_pluginmap_index < 0) && (info == default_pluginmap)) default_pluginmap_index = i;
+			continue;
+		}
+		if (inf.active) any_active_pluginmap = true;
+		if ((default_pluginmap_index < 0) && (info == default_pluginmap)) default_pluginmap_index = i;
 
-			if (info.lastModified () != inf.last_modified) {
-				inf.broken_in_this_version = false;
-				inf.quirky_in_this_version = false;
-				inf.last_modified = info.lastModified ();
-				inf.id.clear ();
-			}
+		if (info.lastModified () != inf.last_modified) {
+			inf.broken_in_this_version = false;
+			inf.quirky_in_this_version = false;
+			inf.last_modified = info.lastModified ();
+			inf.id.clear ();
 		}
 
 		if (inf.id.isEmpty ()) {