--- a/Launcher.st	Sat Jun 01 16:16:49 1996 +0200
+++ b/Launcher.st	Sat Jun 01 17:05:12 1996 +0200
@@ -577,17 +577,20 @@
                    onCancel:nil.
 
     fileName notNil ifTrue:[
-        self withCursor:Cursor write do:[
+        self showCursor:Cursor write.
+        [
             (ObjectMemory snapShotOn:fileName) ifFalse:[
                 "
                  snapshot failed for some reason (disk full, no permission etc.)
                 "
                 self warn:(resources string:'failed to save snapshot image (disk full or not writable)').
             ]
-        ]
+        ] valueNowOrOnUnwindDo:[
+            self restoreCursors.
+        ].
     ].
 
-    "Modified: 29.5.1996 / 15:02:39 / cg"
+    "Modified: 1.6.1996 / 17:02:45 / cg"
 !
 
 snapshotAndExit
@@ -601,9 +604,13 @@
                    onCancel:nil.
 
     fileName notNil ifTrue:[
-        self withCursor:Cursor write do:[
+        self showCursor:Cursor write.
+        [
             ok := ObjectMemory snapShotOn:fileName.
+        ] valueNowOrOnUnwindDo:[
+            self restoreCursors.
         ].
+
         ok ifFalse:[
             "
              snapshot failed for some reason (disk full, no permission etc.)
@@ -627,7 +634,7 @@
         ]
     ].
 
-    "Modified: 29.5.1996 / 19:21:01 / cg"
+    "Modified: 1.6.1996 / 17:02:07 / cg"
 ! !
 
 !NewLauncher methodsFor:'actions - goodies'!
@@ -2025,11 +2032,16 @@
 
 restarted
     "image restart - since WindowGroup recreates the process with
-     default prio, we have to raise the prio again.
-     Mhmh - this looks like a bug to me ..."
+     the default priority, we have to raise the prio again.
+     Mhmh - this looks like a bug to me ...
+     Also, the cursor (which was stored as a write or waitCursor) must
+     be reset to normal."
 
     Processor activeProcess priority:(Processor userSchedulingPriority + 1).
+
     super restarted
+
+    "Modified: 1.6.1996 / 16:58:25 / cg"
 !
 
 saveAndTerminate
@@ -2818,5 +2830,5 @@
 !NewLauncher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.140 1996-05-31 22:33:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.141 1996-06-01 15:05:12 cg Exp $'
 ! !