--- a/AbstractSettingsApplication.st	Wed Sep 08 12:32:29 2004 +0200
+++ b/AbstractSettingsApplication.st	Wed Sep 08 17:22:12 2004 +0200
@@ -7248,21 +7248,27 @@
 
 basicSaveSettings
 
-    |rDoits|
-
-    RDoItServer defaultPortNumberOrPath:self rDoitServerPortOrPath value.
+    |shouldRun portOrPath|
+
+    portOrPath := self rDoitServerPortOrPath value.
+    portOrPath isNumeric ifTrue:[
+        "a numeric string means it is a TCP port number"
+        portOrPath := portOrPath asInteger.
+    ].
+
+    RDoItServer defaultPortNumberOrPath:portOrPath.
     RDoItServer logging:self rDoitLogging value.
     RDoItServer errorLogging:self rDoitErrorLogging value.
     RDoItServer errorCatching:(self rDoitErrorDebugging value not).
-    rDoits := self rDoitsEnabled value.
-    rDoits ~~ RDoItServer serverRunning ifTrue:[
-        rDoits ifFalse:[
+    shouldRun := self rDoitsEnabled value.
+    shouldRun ~~ RDoItServer serverRunning ifTrue:[
+        shouldRun ifFalse:[
             RDoItServer stop
         ] ifTrue:[
             RDoItServer start.
             "/ must wait a bit; give it a chance to
             "/ really start (before checking)
-            Delay waitForSeconds:0.5.
+            Delay waitForSeconds:1.
             RDoItServer serverRunning ifFalse:[
                 self warn:'RDoit startup failed (see stderr).'
             ]
@@ -7343,7 +7349,7 @@
 rDoitsEnabledChanged
     self updateModifiedChannel.
     self rDoitsEnabled value ifTrue:[
-        rDoitServerPortOrPath value isNil ifTrue:[
+        rDoitServerPortOrPath value isEmptyOrNil ifTrue:[
             rDoitServerPortOrPath value:(RDoItServer defaultPortNumberOrPath)
         ]
     ]
@@ -11182,5 +11188,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.161 2004-07-06 12:31:32 stefan Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.162 2004-09-08 15:22:12 stefan Exp $'
+! !