Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10858 from LunaMoo/pauseMenuExit

Browse source 
Add "--pause-menu-exit" option.
This commit is contained in:
Henrik Rydgård 2018-04-02 23:32:01 +02:00 • committed by GitHub
commit e51fdace3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/Config.h
View file

@ -116,6 +116,7 @@ public:
#if !defined(MOBILE_DEVICE)
bool bPauseExitsEmulator;
#endif
bool bPauseMenuExitsEmulator;
bool bPS3Controller;
// Core

2
UI/NativeApp.cpp
View file

@ -434,6 +434,8 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
if (!strncmp(argv[i], "--escape-exit", strlen("--escape-exit")))
g_Config.bPauseExitsEmulator = true;
#endif
if (!strncmp(argv[i], "--pause-menu-exit", strlen("--pause-menu-exit")))
g_Config.bPauseMenuExitsEmulator = true;
break;
}
} else {

13
UI/PauseScreen.cpp
View file

@ -349,7 +349,12 @@ void GamePauseScreen::CreateViews() {
rightColumnItems->Add(new Choice(rp->T("ReportButton", "Report Feedback")))->OnClick.Handle(this, &GamePauseScreen::OnReportFeedback);
}
rightColumnItems->Add(new Spacer(25.0));
rightColumnItems->Add(new Choice(pa->T("Exit to menu")))->OnClick.Handle(this, &GamePauseScreen::OnExitToMenu);
if (g_Config.bPauseMenuExitsEmulator) {
I18NCategory *mm = GetI18NCategory("MainMenu");
rightColumnItems->Add(new Choice(mm->T("Exit")))->OnClick.Handle(this, &GamePauseScreen::OnExitToMenu);
} else {
rightColumnItems->Add(new Choice(pa->T("Exit to menu")))->OnClick.Handle(this, &GamePauseScreen::OnExitToMenu);
}
}
UI::EventReturn GamePauseScreen::OnGameSettings(UI::EventParams &e) {
@ -392,7 +397,11 @@ UI::EventReturn GamePauseScreen::OnScreenshotClicked(UI::EventParams &e) {
}
UI::EventReturn GamePauseScreen::OnExitToMenu(UI::EventParams &e) {
TriggerFinish(DR_OK);
if (g_Config.bPauseMenuExitsEmulator) {
System_SendMessage("finish", "");
} else {
TriggerFinish(DR_OK);
}
return UI::EVENT_DONE;
}