# HG changeset patch
# User vkarnauk
# Date 1370437053 -14400
# Node ID 0be4c7d2e53b1c86b9ea6a26caa0b9f7d1b75be9
# Parent  643f1ca93dd6bc1165a63052252c856f1dbe5cc6
8015425: [macosx] A follow-up for the fix 8010721
Reviewed-by: serb, anthony

diff -r 643f1ca93dd6 -r 0be4c7d2e53b jdk/src/macosx/native/sun/awt/AWTWindow.m
--- a/jdk/src/macosx/native/sun/awt/AWTWindow.m	Wed Jun 05 14:21:31 2013 +0400
+++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m	Wed Jun 05 16:57:33 2013 +0400
@@ -539,7 +539,7 @@
     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];