After merge fixes

This commit is contained in:
2015-10-08 23:59:26 +02:00
parent 7f344263da
commit db1baad3c1
2 changed files with 6 additions and 2 deletions
+4
View File
@@ -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;