Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 7261:1390369d4457
8015425: [macosx] A follow-up for the fix 8010721
Reviewed-by: serb, anthony
author | vkarnauk |
---|---|
date | Wed, 05 Jun 2013 16:57:33 +0400 |
parents | 8b274eccd94a |
children | a4af3d10d19e |
files | src/macosx/native/sun/awt/AWTWindow.m |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macosx/native/sun/awt/AWTWindow.m Wed Jun 05 14:21:31 2013 +0400 +++ b/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];