STXInstaller.st
changeset 682 9fcd010d8fd3
parent 678 4dd439ebf162
child 790 79bc027907ee
--- a/STXInstaller.st	Wed Feb 25 23:51:18 1998 +0100
+++ b/STXInstaller.st	Wed Feb 25 23:57:53 1998 +0100
@@ -1083,33 +1083,45 @@
             [:progressValue :currentAction| |msg|
 
               Processor activeProcess withPriority:7 do:[
-                  actionPercentageHolder := progressValue.
-                  actionTextHolder := currentAction.
+                  [
+                      actionPercentageHolder := progressValue.
+                      actionTextHolder := currentAction.
+
+                      fullInstallation ifFalse:[
+                            self outputInitialMessage.
+                      ].
 
-                  fullInstallation ifFalse:[
-                        self outputInitialMessage.
-                  ].
+                      (self createDirectories) ifTrue:[
+                          doDfMonitoring := true.
+                          ok := self copyFiles
+                      ].
+                      self createSymbolicLinks.
+
+                      progressValue value:100.
 
-                  (self createDirectories) ifTrue:[
-                      doDfMonitoring := true.
-                      ok := self copyFiles
-                  ].
-                  self createSymbolicLinks.
-
-                  progressValue value:100.
-
-                  progressView topView abortButton label:(resources string:'continue').
-                  progressView topView abortButton action:[progressView topView hide].
-                  msg := (resources 
-                             array:#('ST/X Installation finished.' '' 'press continue ...' '' '' ''))
-                                 asStringCollection.
-                  actionTextHolder value:nil.
-                  actionTextHolder value:msg.
+                      progressView topView abortButton label:(resources string:'continue').
+                      progressView topView abortButton action:[progressView topView hide].
+                      msg := (resources 
+                                 array:#('ST/X Installation finished.' '' 'press continue ...' '' '' ''))
+                                     asStringCollection.
+                      actionTextHolder value:nil.
+                      actionTextHolder value:msg.
+                 ] valueOnUnwindDo:[
+                    dfMonitorProcess notNil ifTrue:[
+                        dfMonitorProcess terminate.
+                        dfMonitorProcess := nil.
+                    ].
+                    copyProcess notNil ifTrue:[
+                        copyProcess terminate.
+                        copyProcess := nil.
+                    ].
+                 ]
               ] 
             ].
 
     dfMonitorProcess notNil ifTrue:[
-        dfMonitorProcess terminate
+        dfMonitorProcess terminate.
+        dfMonitorProcess := nil.
     ].
     copyProcess notNil ifTrue:[
         copyProcess terminate.
@@ -1122,7 +1134,7 @@
     "
 
     "Created: / 17.7.1996 / 15:11:27 / cg"
-    "Modified: / 25.2.1998 / 19:36:08 / cg"
+    "Modified: / 25.2.1998 / 22:57:10 / cg"
 !
 
 open