Skip to content

Commit 0356d20

Browse files
committed
8225101: Crash at sun.awt.X11.XlibWrapper.XkbGetUpdatedMap when change keybord map
Reviewed-by: prr, pbansal
1 parent 38c425d commit 0356d20

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2558,14 +2558,16 @@ private void processXkbChanges(XEvent ev) {
25582558
//System.out.println("XkbNewKeyboard:"+(xke.get_new_kbd()));
25592559
break;
25602560
case XConstants.XkbMapNotify :
2561-
//TODO: provide a simple unit test.
2562-
XlibWrapper.XkbGetUpdatedMap(getDisplay(),
2563-
XConstants.XkbKeyTypesMask |
2564-
XConstants.XkbKeySymsMask |
2565-
XConstants.XkbModifierMapMask |
2566-
XConstants.XkbVirtualModsMask,
2567-
awt_XKBDescPtr);
2568-
//System.out.println("XkbMap:"+(xke.get_map()));
2561+
if (awt_XKBDescPtr != 0) {
2562+
//TODO: provide a simple unit test.
2563+
XlibWrapper.XkbGetUpdatedMap(getDisplay(),
2564+
XConstants.XkbKeyTypesMask |
2565+
XConstants.XkbKeySymsMask |
2566+
XConstants.XkbModifierMapMask |
2567+
XConstants.XkbVirtualModsMask,
2568+
awt_XKBDescPtr);
2569+
}
2570+
//System.out.println("XkbMap:"+(xke.get_map()));
25692571
break;
25702572
case XConstants.XkbStateNotify :
25712573
// May use it later e.g. to obtain an effective group etc.

0 commit comments

Comments
 (0)