#1380:

* fix cython warning: don't pretend that we initialize the structure * handle errors in XkbGetState and return an empty string git-svn-id: https://xpra.org/svn/Xpra/trunk@14570 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Dec 19, 2016 · be708a0 · be708a0
1 parent 5009cce
commit be708a0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/xpra/x11/bindings/keyboard_bindings.pyx b/src/xpra/x11/bindings/keyboard_bindings.pyx
@@ -363,8 +363,10 @@ cdef class _X11KeyboardBindings(_X11CoreBindings):
         return self.get_layout_group()
 
     def get_layout_group(self):
-        cdef XkbStateRec xkb_state = XkbStateRec()
-        XkbGetState(self.display, XkbUseCoreKbd, &xkb_state)
+        cdef XkbStateRec xkb_state
+        if not XkbGetState(self.display, XkbUseCoreKbd, &xkb_state):
+            log.warn("Warning: cannot get keyboard layout group")
+            return ""
         return xkb_state.group
 
     def hasXkb(self):