Do not exit big picture with circle

This is the default behavior of the home_menu_page, which was only
intended for use during gameplay originally.
We also expect the game grid to have a parent.

Author: Megamouse

rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture.cpp

@@ -84,6 +84,7 @@ namespace rsx
 				break;
 			}
 
+			const bool main_menu_is_current_page = m_main_menu.is_current_page;
 			const page_navigation navigation = m_main_menu.handle_button_press(button_press, is_auto_repeat, m_auto_repeat_ms_interval);
 
 			switch (navigation)
@@ -110,6 +111,12 @@ namespace rsx
 			}
 			case page_navigation::exit:
 			{
+				// Don't exit if circle was pressed in the main menu
+				if (main_menu_is_current_page && button_press == pad_button::circle)
+				{
+					break;
+				}
+
 				// Don't call close() synchronously from the input thread - just like the pause menu's own
 				// "Exit Game", tearing down the shell on the main thread takes this dialog down as a side effect.
 				g_big_picture_mode_active = false;

rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_game_grid.cpp

@@ -322,12 +322,8 @@ namespace rsx
 				if (button_press == pad_button::circle)
 				{
 					play_sound(sound_effect::cancel);
-					if (parent)
-					{
-						set_current_page(parent);
-						return page_navigation::back;
-					}
-					return page_navigation::exit;
+					set_current_page(ensure(parent));
+					return page_navigation::back;
 				}
 
 				return page_navigation::stay;
@@ -372,12 +368,8 @@ namespace rsx
 				return page_navigation::stay;
 			case pad_button::circle:
 				play_sound(sound_effect::cancel);
-				if (parent)
-				{
-					set_current_page(parent);
-					return page_navigation::back;
-				}
-				return page_navigation::exit;
+				set_current_page(ensure(parent));
+				return page_navigation::back;
 			default:
 				return page_navigation::stay;
 			}