From b765989b4209198c844f06242edd5aadb15c9e14 Mon Sep 17 00:00:00 2001
From: Eric Petit <eric@lapsus.org>
Date: Sun, 25 Jun 2006 19:35:19 +0000
Subject: [PATCH] Backport of [442]

---
 macosx/Controller.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 915b9fc1d..6408c6f2f 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -234,7 +234,7 @@ static void sleepCallBack(void * controller, io_service_t y,
 
 - (BOOL) applicationShouldHandleReopen: (NSApplication *) app hasVisibleWindows: (BOOL) visibleWindows
 {
-    if (!visibleWindows)
+    if (![fWindow isVisible] && ![[fPrefsController window] isVisible])
         [fWindow makeKeyAndOrderFront: nil];
     return NO;
 }