minesweeper: hotfix exit

2 files changed, 10 insertions, 8 deletions

diff --git a/src/games/minesweeper/Minesweeper.cpp b/src/games/minesweeper/Minesweeper.cpp
index 1f40b33..a1886ff 100644
--- a/src/games/minesweeper/Minesweeper.cpp
+++ b/src/games/minesweeper/Minesweeper.cpp
@@ -127,12 +127,15 @@ Minesweeper::Update(std::vector<SDL_Event>& events)
             ProcessEventDuringResume(event);
         }
     }
+    if (m_run_state == exit) {
+        return false;
+    }
 
     if (m_run_state == pause) {
         DrawBoard();
         DrawPauseMenu();
     }
-    else if (m_run_state == start_menu) {
+    else if (m_run_state == start) {
         DrawStartMenu();
     }
     else if (m_run_state == resume) {
@@ -143,8 +146,7 @@ Minesweeper::Update(std::vector<SDL_Event>& events)
         DrawGameOverMenu();
     }
 
-    bool keep_running = m_run_state != exit;
-    return keep_running;
+    return true;
 }
 
 void
@@ -307,7 +309,7 @@ Minesweeper::DrawPauseMenu()
         m_run_state = resume;
     }
     if (ImGui::Button("Restart")) {
-        m_run_state = start_menu;
+        m_run_state = start;
     }
     if (ImGui::Button("Exit")) {
         m_run_state = exit;
@@ -318,7 +320,7 @@ Minesweeper::DrawPauseMenu()
 void
 Minesweeper::DrawStartMenu()
 {
-    ImGui::Begin("MinesweeperStartMenu");
+    ImGui::Begin("MinesweeperStart");
     if (ImGui::RadioButton("beginner", m_difficulty == beginner ? true : false)) {
         m_difficulty = beginner;
     }
@@ -343,7 +345,7 @@ Minesweeper::DrawGameOverMenu()
 {
     ImGui::Begin("MinesweeperGameOverMenu");
     if (ImGui::Button("Play Again")) {
-        m_run_state = start_menu;
+        m_run_state = start;
     }
     if (ImGui::Button("Exit")) {
         m_run_state = exit;
diff --git a/src/games/minesweeper/Minesweeper.hpp b/src/games/minesweeper/Minesweeper.hpp
index c0bae7a..f29df14 100644
--- a/src/games/minesweeper/Minesweeper.hpp
+++ b/src/games/minesweeper/Minesweeper.hpp
@@ -23,7 +23,7 @@ namespace std {
 class Minesweeper : public Game {
 public:
     enum RunState {
-        start_menu,
+        start,
         pause,
         resume,
         game_over,
@@ -77,7 +77,7 @@ private:
 
 
 private:
-    RunState m_run_state = start_menu;
+    RunState m_run_state = start;
     Difficulty m_difficulty = beginner;
 
     float m_world_width = 4.0f;