--- a/SVN__ConfigurationApp.st	Thu Oct 18 16:27:14 2012 +0200
+++ b/SVN__ConfigurationApp.st	Thu Oct 18 16:27:22 2012 +0200
@@ -858,7 +858,7 @@
     ]
 
     "Created: / 25-03-2010 / 08:28:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 14-09-2012 / 17:13:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-10-2012 / 16:18:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doConfigurationEditCurrent
@@ -972,9 +972,9 @@
 !ConfigurationApp methodsFor:'aspects'!
 
 aspects
-    ^ #( #svnEnabled #svnVerbose svnCurrentConfiguration svnCommand svnDiff2Command  svnDiff3Command)
+    ^ #( #svnEnabled #svnVerbose  svnCommand svnDiff2Command  svnDiff3Command)
 
-    "Modified: / 12-03-2012 / 11:23:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-10-2012 / 16:18:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 configurationSelectedHolder
@@ -1134,25 +1134,41 @@
 
 basicReadSettings
 
-    | confs |
+    | configurations current |
 
     self readAspects: self aspects from:currentUserPrefs.
-    self svnConfigurations2 value: (confs := SVN::Configuration configurations deepCopy asList).
+
+    configurations := SVN::Configuration configurations deepCopy asList.
+    current := configurations 
+        detect:[:e|e name = Configuration current name] 
+        ifNone:[self error:'Internal inconsistency'].
+
+    self svnConfigurations2 value: configurations.
+    self svnCurrentConfiguration value: current.
 
     "Created: / 19-04-2008 / 09:42:59 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 25-05-2009 / 19:05:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
-    "Modified: / 31-03-2011 / 14:17:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-10-2012 / 16:23:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 basicSaveSettings
 
+    | configurations current |
+
     self writeAspects: self aspects to:currentUserPrefs.
-    SVN::Configuration configurations: self svnConfigurations2 value asArray deepCopy.
+
+    configurations := self svnConfigurations2 value asArray.
+    current := self svnCurrentConfiguration value.
+    self assert: (configurations includesIdentical: current).
+
+    SVN::Configuration configurations: configurations.
+    SVN::Configuration current: current.
+
     self resetCachedRepositories
 
     "Created: / 19-04-2008 / 09:42:59 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 25-05-2009 / 19:06:45 / Jan Vrany <vranyj1@fel.cvut.cz>"
-    "Modified: / 29-03-2012 / 14:24:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-10-2012 / 16:21:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 helpFilename