From 70d8f553d6290aa5d56cd71a3f05b7b5b52ec117 Mon Sep 17 00:00:00 2001
From: rsn8887 <rsn8887@users.noreply.github.com>
Date: Sun, 24 Dec 2017 09:46:13 -0600
Subject: [PATCH] fix keys being pressed when pressing Vita buttons

---
 Readme.txt                  | 3 +++
 src/gp2x/menu/menu_main.cpp | 7 ++++++-
 src/psp2/psp2_input.c       | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Readme.txt b/Readme.txt
index 3c88577..d1ab815 100755
--- a/Readme.txt
+++ b/Readme.txt
@@ -112,6 +112,9 @@ Square = Backspace
 Triangle = Toggle Shift
 
 CHANGELOG:
+1.56
+
+- fix keys being pressed when pressing Vita buttons (introduced in 1.55)
 
 1.55
 
diff --git a/src/gp2x/menu/menu_main.cpp b/src/gp2x/menu/menu_main.cpp
index 56ce831..7ffe5b4 100755
--- a/src/gp2x/menu/menu_main.cpp
+++ b/src/gp2x/menu/menu_main.cpp
@@ -35,6 +35,7 @@
 #include <psp2/shellutil.h>
 #include <psp2/io/fcntl.h> 
 #define SDL_PollEvent PSP2_PollEvent
+int inside_menu = 0;
 #endif
 
 extern int kickstart;
@@ -844,6 +845,7 @@ int run_mainMenu()
 	init_text(0);
 	
 #ifdef __PSP2__
+	inside_menu = 1;
 	SDL_Event event;
 	while (SDL_PollEvent(&event) > 0);
 #endif
@@ -1047,11 +1049,14 @@ int run_mainMenu()
 #endif
 
 	//See if new joysticks have been paired
-   close_joystick();
+	close_joystick();
 	SDL_QuitSubSystem(SDL_INIT_JOYSTICK);	
 	SDL_InitSubSystem(SDL_INIT_JOYSTICK);
 	init_joystick();
 	
 	update_display();
+#ifdef __PSP2__
+	inside_menu = 0;
+#endif
 	return mainMenu_case;
 }
diff --git a/src/psp2/psp2_input.c b/src/psp2/psp2_input.c
index f7d5205..b585b6a 100644
--- a/src/psp2/psp2_input.c
+++ b/src/psp2/psp2_input.c
@@ -1,5 +1,7 @@
 #include "psp2_input.h"
 
+extern int inside_menu;
+
 SDLKey getKey(Uint8 button) {
 	
 	switch(button) {
@@ -51,7 +53,7 @@ int PSP2_PollEvent(SDL_Event *event) {
 	
 	int ret = SDL_PollEvent(event);
 
-	if(event != NULL) {
+	if(event != NULL && inside_menu) {
 
 		switch (event->type) {