stop the world and let me get off (2)

svn: r17112

collects/2htdp/private/world.ss

@@ -215,26 +215,31 @@
           (queue-callback 
            (lambda ()
              (with-handlers ([exn? (handler #t)])
-	       (define stop-it #f)
                (define tag (format "~a callback" 'transform))
                (define nw (transform (send world get) arg ...))
                (when (package? nw)
                  (broadcast (package-message nw))
                  (set! nw (package-world nw)))
-               (printf "~s\n" nw)
-	       (when (stop-the-world? nw)
+               (if (stop-the-world? nw)
+		   (begin
 		     (set! nw (stop-the-world-world nw))
-		 (set! stop-it #t))
+		     (send world set tag nw)
+		     (when last-picture
+		       (set! draw last-picture))
+		     (when draw (pdraw))
+		     (callback-stop! 'name)
+		     (enable-images-button))
 		   (let ([changed-world? (send world set tag nw)])
 		     (unless changed-world?
 		       (when draw (pdraw))
-                   (when (or stop-it (pstop))
+		       (when (pstop)
+			 (printf "!stop!\n")
 			 (when last-picture 
 			   (set! draw last-picture)
 			   (pdraw))
 			 (callback-stop! 'name)
 			 (enable-images-button)))
-                 changed-world?))))))
+		     changed-world?)))))))
       
       ;; tick, tock : deal with a tick event for this world 
       (def/pub-cback (ptock) tick)

collects/2htdp/universe.ss

@@ -24,7 +24,7 @@
 (provide (all-from-out "private/image.ss"))
 
 (provide 
- (rename-out (make-stop-the-world STOP!))) ;; World -> STOP!
+ (rename-out (make-stop-the-world stop-with))) ;; World -> STOP
 
 (provide
  launch-many-worlds