better implementation of r9721

diff --git a/macosx/Controller.m b/macosx/Controller.m
index f5f8273bd3bb1c601e10a584a136a8ee4d84d862..fb9f2bd6c066a2d288c90025e083b2ece3dcd3ca 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -630,11 +630,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (BOOL) applicationShouldHandleReopen: (NSApplication *) app hasVisibleWindows: (BOOL) visibleWindows
 {
-    for (NSWindow * window in [NSApp windows])
-        if ([window isMainWindow] && [window isVisible])
-            return NO;
+    NSWindow * mainWindow = [NSApp mainWindow];
+    if (!mainWindow || ![mainWindow isVisible])
+        [fWindow makeKeyAndOrderFront: nil];
     
-    [fWindow makeKeyAndOrderFront: nil];
     return NO;
 }