From cc87fcbb58dd64a392f86afe59910214b04a1f41 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Tue, 1 Mar 2016 13:39:01 +1100 Subject: [PATCH] Further cleanup, hopefully fixed build --- src/hotkey/hotkey_preferences_display.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/hotkey/hotkey_preferences_display.cpp b/src/hotkey/hotkey_preferences_display.cpp index 6db6ab414d68..0083aea302e1 100644 --- a/src/hotkey/hotkey_preferences_display.cpp +++ b/src/hotkey/hotkey_preferences_display.cpp @@ -58,29 +58,19 @@ hotkey::hotkey_ptr show_binding_dialog(CVideo& video, const std::string& id) video.flip(); SDL_Event event; event.type = 0; - int keycode = -1, mod = -1; - - while ( event.type != SDL_KEYDOWN && event.type != SDL_JOYBUTTONDOWN - && event.type != SDL_JOYHATMOTION - && (event.type != SDL_MOUSEBUTTONDOWN ) - ) - SDL_PollEvent(&event); -#if SDL_VERSION_ATLEAST(2,0,0) - events::peek_for_resize(); -#endif + int keycode = -1; do { switch (event.type) { case SDL_KEYDOWN: keycode = event.key.keysym.sym; - mod = event.key.keysym.mod; break; } SDL_PollEvent(&event); #if SDL_VERSION_ATLEAST(2,0,0) - events::peek_for_resize(); + events::peek_for_resize(); #endif } while (event.type != SDL_KEYUP && event.type != SDL_JOYBUTTONUP