From 7adab0f79c65cc898c63431084fcecb3f600752d Mon Sep 17 00:00:00 2001 From: Nigel Reeves Date: Wed, 15 May 2013 09:42:21 +0100 Subject: [PATCH] Prevent segfault when start a RAIL remote Application --- client/X11/xf_keyboard.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/client/X11/xf_keyboard.c b/client/X11/xf_keyboard.c index a7ff67ce0..e7db12cc6 100644 --- a/client/X11/xf_keyboard.c +++ b/client/X11/xf_keyboard.c @@ -195,12 +195,13 @@ void xf_kbd_focus_in(xfInfo* xfi) Window wdummy; UINT32 state = 0; - input = xfi->instance->input; - - syncFlags = xf_kbd_get_toggle_keys_state(xfi); - XQueryPointer(xfi->display, xfi->window->handle, &wdummy, &wdummy, &mouseX, &mouseY, &dummy, &dummy, &state); - - input->FocusInEvent(input, syncFlags, mouseX, mouseY); + if (xfi->display && xfi->window) + { + input = xfi->instance->input; + syncFlags = xf_kbd_get_toggle_keys_state(xfi); + XQueryPointer(xfi->display, xfi->window->handle, &wdummy, &wdummy, &mouseX, &mouseY, &dummy, &dummy, &state); + input->FocusInEvent(input, syncFlags, mouseX, mouseY); + } } BOOL xf_kbd_handle_special_keys(xfInfo* xfi, KeySym keysym)