From e4ed192088a767db8efdc6736b3426863fce7cbb Mon Sep 17 00:00:00 2001
From: Derek Christ <christ.derek@gmail.com>
Date: Sun, 17 Jan 2021 12:04:11 +0100
Subject: [PATCH] Fix bug

---
 data/res           | 2 +-
 src/Controller.cpp | 4 +++-
 src/Menu.cpp       | 5 -----
 src/Menu.h         | 2 --
 src/eventActions.h | 6 ------
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/data/res b/data/res
index 84f2a02..598d92b 160000
--- a/data/res
+++ b/data/res
@@ -1 +1 @@
-Subproject commit 84f2a02390e3bab79bccfd7d4a03abdfb7914224
+Subproject commit 598d92bdd62413d4110687d448bb49f38d83245e
diff --git a/src/Controller.cpp b/src/Controller.cpp
index 916593e..d0b2a7a 100644
--- a/src/Controller.cpp
+++ b/src/Controller.cpp
@@ -172,7 +172,9 @@ void Controller::run()
         menu->writeWindowActions(gameEventHandler->getWindowActionRegister());
         gameWindow->handleWindowActionRegister(gameEventHandler->getWindowActionRegister());
 
-        menu->handleMouseButtonActionRegister(gameEventHandler->getMouseButtonActionRegister(), gameWindow);
+        // Handle widget pressed event only when a screen is currently active
+        if (menu->getActiveScreen())
+            menu->handleMouseButtonActionRegister(gameEventHandler->getMouseButtonActionRegister(), gameWindow);
     }
 }
 
diff --git a/src/Menu.cpp b/src/Menu.cpp
index 457f106..0087631 100644
--- a/src/Menu.cpp
+++ b/src/Menu.cpp
@@ -4,11 +4,6 @@
 #include "helper.h"
 #include <iostream>
 
-void (Menu::*widgetPressedActionRegister[widgetPressedActions::WIDGET_PRESSED_ACTION_NUM_ITEMS])() = {
-    &Menu::onPlayPressed,
-    &Menu::onExitPressed
-};
-
 Menu::Menu(Framebuffer *p_framebuffer, ShaderProgram *p_shaderProgram) :
     framebuffer(p_framebuffer), shaderProgram(p_shaderProgram)
 {
diff --git a/src/Menu.h b/src/Menu.h
index eba66a0..a2dc29e 100644
--- a/src/Menu.h
+++ b/src/Menu.h
@@ -26,8 +26,6 @@ public:
     void onPlayPressed();
     void onExitPressed();
 
-    void (*widgetPressedActionRegister[widgetPressedActions::WIDGET_PRESSED_ACTION_NUM_ITEMS])();
-
 private:
     Framebuffer *framebuffer;
     ShaderProgram *shaderProgram;
diff --git a/src/eventActions.h b/src/eventActions.h
index 7c96594..8a8aa49 100644
--- a/src/eventActions.h
+++ b/src/eventActions.h
@@ -29,9 +29,3 @@ enum mouseButtonActions {
     middleClicked,
     MOUSE_BUTTON_ACTION_NUM_ITEMS
 };
-
-enum widgetPressedActions {
-    playClicked,
-    exitClicked,
-    WIDGET_PRESSED_ACTION_NUM_ITEMS
-};