[adonthell-wastesedge-commits] Release_0-3-1 3621f37 020/237: Fixed a few things with main_menu

[Kai Sterker]

tag: Release_0-3-1
commit 3621f37ce432b1c39965a3fc956da7f0157fd6f1
Author: adondev <adondev>
Commit: adondev <adondev>

    Fixed a few things with main_menu
---
 scripts/init.py              |    4 ----
 scripts/modules/main_menu.py |    4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/init.py b/scripts/init.py
index 4bbac81..0fbcbdb 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -114,10 +114,6 @@ class title_screen:
                 win_manager_input_update ()
                 win_manager_update ()
 
-            if input_has_been_pushed (SDLK_ESCAPE):
-                self.quit = 5
-                break
-    
             win_manager_draw ()
             screen_show ()
             gametime_update()
diff --git a/scripts/modules/main_menu.py b/scripts/modules/main_menu.py
index 362d32c..ea05867 100755
--- a/scripts/modules/main_menu.py
+++ b/scripts/modules/main_menu.py
@@ -193,7 +193,9 @@ class main_menu (win_container):
         if self.lg == None:
             if input_has_been_pushed (SDLK_ESCAPE):
                 self.quit = 0
-                
+                # If we're on the title screen, then leave.
+                if self.startup == 0:
+                    self.set_return_code (5)
 
     # -- Callback to get informed of the player's choice
     def on_select (self):