From 06985a5b6cbbbe06ac7abfe1290c8c2013e1b50b Mon Sep 17 00:00:00 2001
From: Antoine Mercadal <antoine.mercadal@inframonde.eu>
Date: Wed, 2 Nov 2011 12:06:05 +0100
Subject: [PATCH] fix test

---
 AppKit/_CPAttachedWindow.j | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/AppKit/_CPAttachedWindow.j b/AppKit/_CPAttachedWindow.j
index d0994fc98..0759ac4cb 100644
--- a/AppKit/_CPAttachedWindow.j
+++ b/AppKit/_CPAttachedWindow.j
@@ -408,14 +408,9 @@ CPPopoverAppearanceHUD      = 1;
 {
     if (_closeOnBlur && !_isClosed)
     {
-        // set a close flag to avoid infinite loop
-        _isClosed = YES;
-
-        if (_delegate && [_delegate respondsToSelector:@selector(didAttachedWindowShouldClose:)])
-            if ([_delegate didAttachedWindowShouldClose:self])
-                [self close];
-        else
-            [self close];
+        if (!_delegate || ([_delegate respondsToSelector:@selector(didAttachedWindowShouldClose:)]
+            && [_delegate didAttachedWindowShouldClose:self]))
+        [self close];
     }
 }
 
@@ -480,6 +475,9 @@ CPPopoverAppearanceHUD      = 1;
 */
 - (void)close
 {
+    // set a close flag to avoid infinite loop
+    _isClosed = YES;
+
     if (_animates && typeof(_DOMElement.style.WebkitTransform) != "undefined")
     {
         _DOMElement.style.opacity = 0;