mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 04:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Stop crashing when Compose is unavailable

Browse Source 
There was a missing check for when no Compose key was configured in the
xkb file, making _glfw.wl.xkb.composeState NULL and crashing on key
press.

Closes #1059.
This commit is contained in:
Emmanuel Gil Peyrot 2017-08-08 01:33:20 +02:00 committed by Camilla Löwy
parent 2d0ffd788b
commit 0019f7a45e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wl_init.c
View File

@ -294,7 +294,7 @@ static int toGLFWKeyCode(uint32_t key)
static xkb_keysym_t composeSymbol(xkb_keysym_t sym) static xkb_keysym_t composeSymbol(xkb_keysym_t sym)
{ {
if (sym == XKB_KEY_NoSymbol) if (sym == XKB_KEY_NoSymbol || !_glfw.wl.xkb.composeState)
return sym; return sym;
if (xkb_compose_state_feed(_glfw.wl.xkb.composeState, sym) if (xkb_compose_state_feed(_glfw.wl.xkb.composeState, sym)
!= XKB_COMPOSE_FEED_ACCEPTED) != XKB_COMPOSE_FEED_ACCEPTED)