X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=a4b60829e90a139f35aeff1bc19a9cbfab278b3e;hb=2443a8a09966a9940e1420c91d24a297325c2a00;hp=c002c78ebbd6588dafeb1e64a90da9f801ba67ae;hpb=335f4db8f7a8bea9b06eeea911b6d1e1d4de4623;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index c002c78e..a4b60829 100644
--- a/src/events.c
+++ b/src/events.c
@@ -477,6 +477,7 @@ void HandleKey(Key key, int key_status)
   /* allow quick escape to the main menu with the Escape key */
   if (key == KSYM_Escape &&
       game_status != MAINMENU &&
+      game_status != PLAYING &&
       game_status != LEVELED &&
       game_status != CHOOSELEVEL &&
       game_status != SETUP)
@@ -592,6 +593,9 @@ void HandleKey(Key key, int key_status)
     {
       switch(key)
       {
+        case KSYM_Escape:
+	  RequestQuitGame();
+	  break;
 
 #ifdef DEBUG
 	case KSYM_0: