--- a/CVSSourceCodeManagementSettingsAppl.st	Tue Jul 16 14:44:23 2019 +0200
+++ b/CVSSourceCodeManagementSettingsAppl.st	Tue Jul 16 14:44:43 2019 +0200
@@ -1096,27 +1096,31 @@
 !CVSSourceCodeManagementSettingsAppl methodsFor:'change & update'!
 
 selectedPerModuleRootChanged
-    |module entry|
+    |module entry newRemoveEnabled newPerModuleRootModule newPerModuleRoot|
 
-    self acceptChannel value:true.    
-    module := self selectedPerModuleRoot value.
-    module isNil ifTrue:[ 
-        self removeEnabled value:false.
-        self perModuleRootModule value:' '.
-        self perModuleRoot value:''.
-        ^ self
-    ].
+    self acceptChannel value:true.
+    
+    newRemoveEnabled := false.
+    newPerModuleRootModule := ' '.
+    newPerModuleRoot := ''.
 
-    entry := rootsPerModule at:module ifAbsent:#().    
-    (entry first = CVSSourceCodeManager) ifTrue:[
-        self removeEnabled value:true.
-        self perModuleRootModule value:module.
-        self perModuleRoot value:(entry at:2).
-    ] ifFalse:[
-        self removeEnabled value:false.
-        self perModuleRootModule value:module , ' ',('<<use ',entry first managerTypeName,'>>') allBold.
-        self perModuleRoot value:''.
+    module := self selectedPerModuleRoot value.
+    module notNil ifTrue:[ 
+        entry := rootsPerModule at:module ifAbsent:#().    
+        (entry first = CVSSourceCodeManager) ifTrue:[
+            newRemoveEnabled := true.
+            newPerModuleRootModule := module.
+            newPerModuleRoot := (entry at:2).
+        ] ifFalse:[
+            newPerModuleRootModule := module,' ',('<< use ',entry first managerTypeName,' >>') allBold.
+        ].
     ].
+    
+    self removeEnabled value:newRemoveEnabled.
+    self perModuleRootModule value:newPerModuleRootModule.
+    self perModuleRoot value:newPerModuleRoot.
+
+    "Modified: / 16-07-2019 / 14:42:48 / Claus Gittinger"
 !
 
 update:something with:aParameter from:changedObject