From 3076346b3acf06b7d6a36d11963dde8def7c2b83 Mon Sep 17 00:00:00 2001 From: Jjgod Jiang Date: Tue, 20 Apr 2010 07:16:42 -0700 Subject: [PATCH] Fix a crash caused by empty keyboard focus --- src/events/SDL_keyboard.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- src/events/SDL_keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c index d82b76ce5..e6a9ca0ef 100644 --- a/src/events/SDL_keyboard.c +++ b/src/events/SDL_keyboard.c @@ -813,7 +813,7 @@ SDL_SendKeyboardKey(int index, Uint8 state, SDL_scancode scancode) event.key.keysym.sym = keyboard->keymap[scancode]; event.key.keysym.mod = modstate; event.key.keysym.unicode = 0; - event.key.windowID = keyboard->focus->id; + event.key.windowID = keyboard->focus ? keyboard->focus->id : 0; posted = (SDL_PushEvent(&event) > 0); } return (posted); @@ -837,7 +837,7 @@ SDL_SendKeyboardText(int index, const char *text) event.text.windowID = keyboard->focus ? keyboard->focus->id : 0; event.text.which = (Uint8) index; SDL_strlcpy(event.text.text, text, SDL_arraysize(event.text.text)); - event.text.windowID = keyboard->focus->id; + event.text.windowID = keyboard->focus ? keyboard->focus->id : 0; posted = (SDL_PushEvent(&event) > 0); } return (posted);