--- a/Launcher.st	Tue Oct 13 16:47:44 1998 +0200
+++ b/Launcher.st	Tue Oct 13 16:53:55 1998 +0200
@@ -153,12 +153,15 @@
     "return the launcher running on the current screen.
      (for access via addMenu/ removeMenu)"
 
+    |currentScreen|
+
     OpenLaunchers size > 0 ifTrue:[
-	OpenLaunchers do:[:aLauncher |
-	    aLauncher window graphicsDevice == Screen current ifTrue:[
-		^ aLauncher
-	    ]
-	]
+        currentScreen := Screen current.
+        OpenLaunchers do:[:aLauncher |
+            aLauncher window graphicsDevice == currentScreen ifTrue:[
+                ^ aLauncher
+            ]
+        ]
     ].
     ^ nil.
 
@@ -167,7 +170,7 @@
     "
 
     "Modified: / 9.9.1996 / 22:41:36 / stefan"
-    "Modified: / 17.8.1998 / 10:23:20 / cg"
+    "Modified: / 13.10.1998 / 16:09:50 / cg"
 !
 
 openLaunchers
@@ -5935,5 +5938,5 @@
 !Launcher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.381 1998-10-13 14:46:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.382 1998-10-13 14:53:55 cg Exp $'
 ! !