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

[tfry at users.sf.net]

Revision: 4515
          http://sourceforge.net/p/rkward/code/4515
Author:   tfry
Date:     2013-01-27 18:39:49 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
Fixed: After pressing 'Apply' on a settings page, the page would still be considered touched, resulting in duplicate application of changes.

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

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2013-01-27 18:36:07 UTC (rev 4514)
+++ trunk/rkward/ChangeLog	2013-01-27 18:39:49 UTC (rev 4515)
@@ -6,7 +6,6 @@
 	- TODO:
 		- Provide more info (particularly about data) in selection UI
 		- Explicitly document the fact that <include>s can be used for <about> and <dependencies>
-		- Fix duplicate trigger of pluginmap loading when clicking "ok" on settings dialog
 		- Add possibilities for soft dependencies (i.e. dynamic version check within a plugin)
 		- Think about means for cross-package pluginmap includes
 - Added support for the upcoming R 3.0.0			TODO: Check for any more regressions, before release

Modified: trunk/rkward/rkward/settings/rksettings.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettings.cpp	2013-01-27 18:36:07 UTC (rev 4514)
+++ trunk/rkward/rkward/settings/rksettings.cpp	2013-01-27 18:39:49 UTC (rev 4515)
@@ -2,7 +2,7 @@
                           rksettings  -  description
                              -------------------
     begin                : Wed Jul 28 2004
-    copyright            : (C) 2004, 2007, 2008, 2009 by Thomas Friedrichsmeier
+    copyright            : (C) 2004-2013 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -166,6 +166,7 @@
 	for (it = modules.constBegin (); it != modules.constEnd (); ++it) {
 		if (it.value ()->hasChanges ()) {
 			it.value ()->applyChanges ();
+			it.value ()->changed = false;
 			it.value ()->save (KGlobal::config ().data ());
 			tracker ()->signalSettingsChange (it.key ());
 		}