From 551743189ea9400bdba3fedc0af44c0332e80df4 Mon Sep 17 00:00:00 2001
From: Denis Fokin <Denis.Fokin@jetbrains.com>
Date: Fri, 12 Aug 2016 15:55:32 +0300
Subject: [PATCH] IDEA-159597 Mac Native File Chooser: when a modal dialog is
 shown with native file chooser, it's possible to bring main IDEA frame to the
 foreground

---
 .../platform-impl/src/com/intellij/util/ui/OwnerOptional.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java b/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java
index ad88b852ea0f..c9b813cc3590 100644
--- a/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java
+++ b/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java
@@ -83,7 +83,9 @@ public class OwnerOptional {
   }
 
   public OwnerOptional ifNull(Consumer<Frame> consumer) {
-    consumer.consume((Frame)this.myPermanentOwner);
+    if (myPermanentOwner == null) {
+      consumer.consume(null);
+    }
     return this;
   }