Merge pull request #3737 from frangarcj/master

(VITA) Disable Back Touch if in menu
libretro · Oct 5, 2016 · db8eb90 · db8eb90
2 parents 183dc91 + d32bd63
commit db8eb90
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/input/drivers_joypad/psp_joypad.c b/input/drivers_joypad/psp_joypad.c
@@ -232,7 +232,7 @@ static void psp_joypad_poll(void)
          continue;
 #endif
 #if defined(VITA)
-      if (psp2_model == SCE_KERNEL_MODEL_VITA) {
+      if (psp2_model == SCE_KERNEL_MODEL_VITA && !menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL)) {
          SceTouchData back = {0};
          sceTouchPeek(SCE_TOUCH_PORT_BACK, &back, 1);
          for (int i = 0; i < back.reportNum; i++) {