From 05662b678e2c19ebc9e1aff63759a5878c2c2f31 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 14 Apr 2011 10:10:40 -0400
Subject: [PATCH] Fix crash in meta_display_get_above_tab_keycode

https://bugzilla.gnome.org/show_bug.cgi?id=647777
---
 src/core/above-tab-keycode.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/above-tab-keycode.c b/src/core/above-tab-keycode.c
index 56966ab0f..856afe5d9 100644
--- a/src/core/above-tab-keycode.c
+++ b/src/core/above-tab-keycode.c
@@ -76,6 +76,8 @@ compute_above_tab_keycode (Display *xdisplay)
   keyboard = XkbGetKeyboard (xdisplay,
                              XkbGBN_ClientSymbolsMask | XkbGBN_KeyNamesMask | XkbGBN_GeometryMask,
                              XkbUseCoreKbd);
+  if (!keyboard)
+    return best_keycode;
 
   geometry = keyboard->geom;