From b980e1b89967e2f45312e97cc4a1d593974a5957 Mon Sep 17 00:00:00 2001
From: "p.kosyh"
Date: Sat, 27 Nov 2010 12:50:16 +0000
Subject: [PATCH] alt-f4 ~= f4
---
debian/changelog | 1 +
src/sdl-instead/game.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8bc7705..c8eb0c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ instead (1.3.1) unstable; urgency=low
* bug fix (imgl and justify);
* bug fix (languages in WinCE version);
* bug fix (prefs do not create save dir);
+ * bug fix (alt+f4 != f4);
-- Peter Kosyh Mon, 22 Nov 2010 11:17:00 +0300
diff --git a/src/sdl-instead/game.c b/src/sdl-instead/game.c
index 3b358ce..c480788 100644
--- a/src/sdl-instead/game.c
+++ b/src/sdl-instead/game.c
@@ -2677,7 +2677,7 @@ int game_loop(void)
mouse_reset(1);
game_menu_act("/new");
shift_pressed = alt_pressed = 0;
- } else if (!is_key(&ev, "f10")) {
+ } else if (!is_key(&ev, "f10") || (alt_pressed && !is_key(&ev, "f4"))) {
mouse_reset(1);
game_menu(menu_askquit);
} else if (!alt_pressed && (!is_key(&ev, "return") || !is_key(&ev, "enter"))) {
@@ -2698,7 +2698,7 @@ int game_loop(void)
mouse_reset(1);
game_menu(menu_games);
*/
- } else if (!is_key(&ev, "f4")) {
+ } else if (!is_key(&ev, "f4") && !alt_pressed) {
#ifdef _USE_UNPACK
#ifdef _USE_BROWSE
mouse_reset(1);