1 files changed, 6 insertions, 3 deletions
diff --git a/src/ui.cpp b/src/ui.cpp
index ac7a400..bc1f28c 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -14,7 +14,7 @@
 #include <chrono>
 using namespace std::literals::chrono_literals;
 
-extern Menu* currentMenu;
+extern Menu *currentMenu;
 
 std::array<SDL_Keycode, 6> controlMap = {
 	SDLK_w, SDLK_a, SDLK_d, SDLK_LSHIFT, SDLK_LCTRL, SDLK_e
@@ -72,8 +72,6 @@ static bool typeOutSustain = false;
 
 static Mix_Chunk *dialogClick;
 
-extern void mainLoop(void);
-
 /*
  * Fade effect flags
  */
@@ -1244,6 +1242,8 @@ void InputSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 	(void)ev;
 	(void)dt;
 
+	if (currentMenu != nullptr)
+		return;
 
 	auto SCREEN_WIDTH = game::SCREEN_WIDTH;
 	auto SCREEN_HEIGHT = game::SCREEN_HEIGHT;
@@ -1284,6 +1284,9 @@ void InputSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 		//case SDL_MOUSEBUTTONUP:
 
 		case SDL_MOUSEBUTTONDOWN:
+			if (currentMenu != nullptr)
+				break;
+
 			ev.emit<MouseClickEvent>(mouse, e.button.button);
 
 			// run actions?