소스 검색

Wayland: Stop crashing when Compose is unavailable

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.
Emmanuel Gil Peyrot 8 년 전
부모
커밋
0019f7a45e
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      src/wl_init.c

+ 1 - 1
src/wl_init.c

@@ -294,7 +294,7 @@ static int toGLFWKeyCode(uint32_t key)
 
 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;
     if (xkb_compose_state_feed(_glfw.wl.xkb.composeState, sym)
             != XKB_COMPOSE_FEED_ACCEPTED)