diff options
| author | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
| commit | e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5 (patch) | |
| tree | 9d57b5fdd6737bc3449851a87e573abe7be984a6 /backends/events/sdl | |
| parent | deab5b28753155863062746ef1239535f562fd0b (diff) | |
| parent | 842b471e45ae8b7c1b4516b9bd5bf39d61112077 (diff) | |
| download | scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.gz scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.bz2 scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'backends/events/sdl')
| -rw-r--r-- | backends/events/sdl/sdl-events.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp index 9d235e9044..f94171646a 100644 --- a/backends/events/sdl/sdl-events.cpp +++ b/backends/events/sdl/sdl-events.cpp @@ -436,6 +436,14 @@ bool SdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) { event.type = Common::EVENT_QUIT; return true; } + + #ifdef WIN32 + // On Windows, also use the default Alt-F4 quit combination + if ((ev.key.keysym.mod & KMOD_ALT) && ev.key.keysym.sym == SDLK_F4) { + event.type = Common::EVENT_QUIT; + return true; + } + #endif #endif // Ctrl-u toggles mute |