From db1baad3c19cb38dff39d9650df1699ce337d03a Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Thu, 8 Oct 2015 23:59:26 +0200
Subject: [PATCH] After merge fixes

---
 include/Core/Engine.h     | 4 ++--
 include/Game/GUI/Story1.h | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/Core/Engine.h b/include/Core/Engine.h
index d07be98..742c375 100755
--- a/include/Core/Engine.h
+++ b/include/Core/Engine.h
@@ -65,8 +65,8 @@
 
 #include "GUI/Frame.h"
 #include "GUI/Button.h"
-#include "Game/MainMenu.h"
-#include "Game/HUD.h"
+#include "Game/GUI/MainMenu.h"
+#include "Game/GUI/HUD.h"
 
 namespace dd
 {
diff --git a/include/Game/GUI/Story1.h b/include/Game/GUI/Story1.h
index ea6f463..3f0bd97 100644
--- a/include/Game/GUI/Story1.h
+++ b/include/Game/GUI/Story1.h
@@ -215,6 +215,10 @@ private:
 	EventRelay<Frame, Events::KeyDown> m_EKeyDown;
 	bool OnKeyDown(const Events::KeyDown& event)
 	{
+		if (Hidden()) {
+			return;
+		}
+
 		if (event.KeyCode == GLFW_KEY_SPACE) {
 			m_LoadingFrame->CancelPreload();
 			Events::GameStart e;