From 69dcf8a54e427ee1c7ee05086cfa70be6697099b Mon Sep 17 00:00:00 2001
From: Vladislav Karnaukhov <vkarnauk@openjdk.org>
Date: Wed, 5 Jun 2013 16:57:33 +0400
Subject: [PATCH] 8015425: [macosx] A follow-up for the fix 8010721

Reviewed-by: serb, anthony
---
 jdk/src/macosx/native/sun/awt/AWTWindow.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/macosx/native/sun/awt/AWTWindow.m b/jdk/src/macosx/native/sun/awt/AWTWindow.m
index 4a3a4720d02..2997ff4de75 100644
--- a/jdk/src/macosx/native/sun/awt/AWTWindow.m
+++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m
@@ -539,7 +539,7 @@ AWT_ASSERT_APPKIT_THREAD;
     AWTWindow *opposite = [AWTWindow lastKeyWindow];
     if (!IS(self.styleBits, IS_DIALOG)) {
         [CMenuBar activate:self.javaMenuBar modallyDisabled:NO];
-    } else if (IS(self.styleBits, IS_MODAL)) {
+    } else if ((opposite != NULL) && IS(self.styleBits, IS_MODAL)) {
         [CMenuBar activate:opposite->javaMenuBar modallyDisabled:YES];        
     }
     [AWTWindow setLastKeyWindow:nil];