Merge branch 'sdl2' into sdl2-vs2013proj

2014-06-11 23:38:19 -06:00 · 2014-06-11 23:38:19 -06:00 · 05c5df2919
parent 60941029be 89f22bc5ed
commit 05c5df2919
1 changed files with 5 additions and 0 deletions
--- a/Quake/in_sdl.c
+++ b/Quake/in_sdl.c
@ -365,6 +365,11 @@ void IN_UpdateForKeydest (void)
 		Key_ClearStates();
 #if !defined(USE_SDL2)
 		SDL_EnableUNICODE(!gamekey);
+#else
+		if (gamekey)
+			SDL_StopTextInput();
+		else
+			SDL_StartTextInput();
 #endif
 	}
 }