Fixed crash on systems that don't have StopTextInput

libsdl-org · Sep 19, 2010 · 5aa094a · 5aa094a
1 parent 750be4e
commit 5aa094a
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c
@@ -612,11 +612,14 @@ SDL_SetKeyboardFocus(SDL_Window * window)
     if (keyboard->focus && keyboard->focus != window) {
         SDL_SendWindowEvent(keyboard->focus, SDL_WINDOWEVENT_FOCUS_LOST,
                             0, 0);
-
-        //Ensures IME compositions are committed
-        if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
-            SDL_GetVideoDevice()->StopTextInput(SDL_GetVideoDevice());
-        }
+
+        /* Ensures IME compositions are committed */
+        if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
+            SDL_VideoDevice *video = SDL_GetVideoDevice();
+            if (video && video->StopTextInput) {
+                video->StopTextInput(video);
+            }
+        }
     }
 
     keyboard->focus = window;
@@ -626,7 +629,10 @@ SDL_SetKeyboardFocus(SDL_Window * window)
                             0, 0);
 
         if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
-            SDL_StartTextInput();
+            SDL_VideoDevice *video = SDL_GetVideoDevice();
+            if (video && video->StartTextInput) {
+                video->StartTextInput(video);
+            }
         }
     }
 }