8242544: CMD+ENTER key event crashes the application when invoked on …

…dialog Backport-of: a2a0acff66727167bfca879bf908361433e74791
openjdk · Feb 11, 2022 · b0ae8b6 · b0ae8b6 · openjdk-notifier · Feb 11, 2022
1 parent f52ded7
commit b0ae8b6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m
@@ -989,7 +989,10 @@ static jlong _createWindowCommonDo(JNIEnv *env, jobject jWindow, jlong jOwnerPtr
         }
         else
         {
-            [window->nsWindow performSelectorOnMainThread:@selector(setContentView:) withObject:nil waitUntilDone:YES];
+            // If the contentView is set to nil within performKeyEquivalent: the OS will crash.
+            NSView* dummy = [[NSView alloc] initWithFrame: NSMakeRect(0, 0, 10, 10)];
+            [window->nsWindow performSelectorOnMainThread:@selector(setContentView:) withObject:dummy waitUntilDone:YES];
+            [dummy release];
         }
     }
     GLASS_POOL_EXIT;