--- a/AbstractSettingsApplication.st	Fri Aug 25 18:14:51 2006 +0200
+++ b/AbstractSettingsApplication.st	Fri Aug 25 19:18:27 2006 +0200
@@ -10354,7 +10354,11 @@
         ].
 
         manager isNil ifTrue:[
-            Smalltalk at:#SourceCodeManager put:(manager := self selectedManager).
+            manager := self selectedManager.
+            manager isNil ifTrue:[
+                manager := self availableManagers first.
+            ].
+            Smalltalk at:#SourceCodeManager put:manager.
         ].
         manager notNil ifTrue:[
             | nm fn|
@@ -10850,23 +10854,35 @@
 selectedManager
     |idx|
 
+    self availableManagers size == 1 ifTrue:[
+        ^ self availableManagers first
+    ].
+
     idx := self selectedManagerTypeIndexHolder value.
-    (idx == 0 or:[idx isNil]) ifTrue:[^ nil].
-
+    (idx == 0 or:[idx isNil]) ifTrue:[ ^ nil].
     ^ self availableManagers at:idx
 
     "Modified: / 16-08-2006 / 11:18:50 / cg"
 !
 
 selectedManagerTypeIndexHolder
+    |selectedManagerTypeIndex|
 
     selectedManagerTypeIndexHolder isNil ifTrue:[
-        selectedManagerTypeIndexHolder := (self availableManagers indexOf:SourceCodeManager) asValue.
+        selectedManagerTypeIndexHolder := nil asValue.
         selectedManagerTypeIndexHolder onChangeEvaluate:[
             self managerIsCVSSourceCodeManager value:( self selectedManager isCVS ).
             self managerIsStoreSourceCodeManager value:( self selectedManager isStore ).
             self updateModifiedChannel
         ].
+
+        selectedManagerTypeIndex := self availableManagers indexOf:SourceCodeManager.
+        selectedManagerTypeIndex == 0 ifTrue:[
+            self availableManagers size == 1 ifTrue:[
+                selectedManagerTypeIndex := 1.
+            ].
+        ].
+        selectedManagerTypeIndexHolder value:selectedManagerTypeIndex.
     ].
     ^ selectedManagerTypeIndexHolder.
 
@@ -12998,5 +13014,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.241 2006-08-25 16:01:38 cg Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.242 2006-08-25 17:18:27 cg Exp $'
+! !