--- a/tools/JavaSettingsApplication.st	Mon Nov 11 09:48:58 2013 +0000
+++ b/tools/JavaSettingsApplication.st	Mon Nov 11 17:27:08 2013 +0000
@@ -625,11 +625,11 @@
 
 
     javaReleaseList isNil ifTrue:[
-        javaReleaseList := JavaRelease all asList
+        javaReleaseList := JavaRelease all asList addFirst: JavaRelease system; yourself
     ].
     ^ javaReleaseList.
 
-    "Modified: / 27-07-2012 / 00:13:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 11-11-2013 / 16:06:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 jdkBundleHolder
@@ -701,7 +701,7 @@
 
     rel := currentUserPrefs javaRelease.
     (rel isNil and:[Java notNil]) ifTrue:[
-        rel := Java release
+        rel := Java defaultRelease
     ].
     
     self javaReleaseHolder value: rel.
@@ -710,17 +710,19 @@
     self packageBundleHolder value: cpb packages.
     self environmentBundleHolder value: cpb environment.
 
-    "Modified: / 28-01-2013 / 20:32:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 11-11-2013 / 16:15:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 basicSaveSettings
-    self javaReleaseHolder value notNil ifTrue:[
+    | release |
+    release := self javaReleaseHolder value .
+    (release notNil and:[release ~~ JavaRelease system]) ifTrue:[
         currentUserPrefs javaReleaseSelector:  self javaReleaseHolder value selector.
     ] ifFalse:[
         currentUserPrefs javaReleaseSelector: nil.
     ].
 
-    "Modified: / 25-01-2013 / 22:25:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 11-11-2013 / 16:06:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 helpFilename
@@ -754,6 +756,7 @@
         self infoPanel hide.
     ].
 
+    setRel == JavaRelease system ifTrue:[ setRel :=  nil ].
     prefRel ~~ setRel ifTrue:[ ^ true ].
 
 
@@ -761,7 +764,7 @@
 
     ^false
 
-    "Modified: / 16-01-2013 / 13:44:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 11-11-2013 / 16:10:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaSettingsApplication class methodsFor:'documentation'!