From 4b6f8d9007c758f38f3dc370595a6445b10cf407 Mon Sep 17 00:00:00 2001
From: Aloshi <allofquist@yahoo.com>
Date: Fri, 20 Dec 2013 15:47:21 -0600
Subject: [PATCH] Move menu open code to ViewController so you can open it in
 the system select

---
 src/views/GameListView.cpp   |  6 ------
 src/views/ViewController.cpp | 10 ++++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/GameListView.cpp b/src/views/GameListView.cpp
index b819b3fe4..743fb0bf6 100644
--- a/src/views/GameListView.cpp
+++ b/src/views/GameListView.cpp
@@ -23,12 +23,6 @@ bool GameListView::input(InputConfig* config, Input input)
 		}));
 		mTheme->playSound("menuOpenSound");
 		return true;
-	}else if(config->isMappedTo("menu", input) && input.value != 0)
-	{
-		// open menu
-		mWindow->pushGui(new GuiMenu(mWindow));
-		mTheme->playSound("menuOpenSound");
-		return true;
 	}else if(config->isMappedTo("select", input) && input.value != 0)
 	{
 		// open fast select
diff --git a/src/views/ViewController.cpp b/src/views/ViewController.cpp
index ca4f56340..8e9a57d1c 100644
--- a/src/views/ViewController.cpp
+++ b/src/views/ViewController.cpp
@@ -5,6 +5,7 @@
 #include "BasicGameListView.h"
 #include "DetailedGameListView.h"
 #include "GridGameListView.h"
+#include "../components/GuiMenu.h"
 #include "../animations/LaunchAnimation.h"
 #include "../animations/MoveCameraAnimation.h"
 #include "../animations/LambdaAnimation.h"
@@ -176,6 +177,15 @@ bool ViewController::input(InputConfig* config, Input input)
 	if(mLockInput)
 		return true;
 
+	// open menu
+	if(config->isMappedTo("menu", input) && input.value != 0)
+	{
+		// open menu
+		mWindow->pushGui(new GuiMenu(mWindow));
+		ThemeData().playSound("menuOpenSound");
+		return true;
+	}
+
 	if(mCurrentView)
 		return mCurrentView->input(config, input);