Skip to content

Commit

Permalink
Further cleanup, hopefully fixed build
Browse files Browse the repository at this point in the history
  • Loading branch information
Vultraz committed Mar 1, 2016
1 parent 05b0d47 commit cc87fcb
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions src/hotkey/hotkey_preferences_display.cpp
Expand Up @@ -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
Expand Down

0 comments on commit cc87fcb

Please sign in to comment.