preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-14 10:09:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct OnVkey locking on PauseScreen as well

Browse Source
This commit is contained in:
Henrik Rydgård committed 2026-07-12 11:31:29 +02:00
1 parent 9fc2fff68a
commit 497baecc9e
3 files changed
+15 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/PauseScreen.cpp
+13 -4
View File
@@ -341,9 +341,12 @@ void GamePauseScreen::update() {
firstFrame_ = false;
if (finishNextFrame_) {
TriggerFinish(finishNextFrameResult_);
finishNextFrame_ = false;
{
std::lock_guard<std::mutex> lock(finishNextFrameMutex_);
if (finishNextFrame_) {
TriggerFinish(finishNextFrameResult_);
finishNextFrame_ = false;
}
}
const bool networkConnected = IsNetworkConnected();
@@ -385,6 +388,7 @@ GamePauseScreen::~GamePauseScreen() {
void GamePauseScreen::OnVKey(VirtKey virtualKeyCode, bool down) {
// Simple de-bounce using createdTime_, just to be safe.
if (down && virtualKeyCode == VIRTKEY_PAUSE && time_now_d() > createdTime_ + 0.1) {
std::lock_guard<std::mutex> lock(finishNextFrameMutex_);
finishNextFrame_ = true;
finishNextFrameResult_ = DR_BACK;
}
@@ -405,6 +409,7 @@ void GamePauseScreen::CreateSavestateControls(UI::LinearLayout *leftColumnItems,
int slotNum = v->GetSlot();
auto doLoad = [this, slotNum]() {
SaveState::LoadSlot(saveStatePrefix_, slotNum, &ShowMessageAfterSaveStateAction);
std::lock_guard<std::mutex> lock(finishNextFrameMutex_);
finishNextFrame_ = true;
finishNextFrameResult_ = DR_CANCEL;
};
@@ -777,12 +782,14 @@ void GamePauseScreen::ShowContextMenu(UI::View *menuButton, bool portrait) {
screenManager()->push(new UI::MessagePopupScreen(di->T("Reset"), confirmMessage, di->T("Reset"), di->T("Cancel"), [this](bool result) {
if (result) {
System_PostUIMessage(UIMessage::REQUEST_GAME_RESET);
finishNextFrameResult_ = DR_BACK; // resume
std::lock_guard<std::mutex> lock(finishNextFrameMutex_);
finishNextFrame_ = true;
finishNextFrameResult_ = DR_BACK; // resume
}
}));
} else {
System_PostUIMessage(UIMessage::REQUEST_GAME_RESET);
std::lock_guard<std::mutex> lock(finishNextFrameMutex_);
finishNextFrameResult_ = DR_BACK; // resume
finishNextFrame_ = true;
}
@@ -819,6 +826,7 @@ void GamePauseScreen::dialogFinished(const Screen *dialog, DialogResult dr) {
std::string tag = dialog->tag();
if (tag == "ScreenshotView") {
if (dr == DR_OK) {
std::lock_guard<std::mutex> lock(finishNextFrameMutex_);
finishNextFrame_ = true;
} else if (dr != DR_CANCEL && dr != DR_BACK) {
// Just go back to the pause menu, but refresh the savestate thumbnails in case something changed.
@@ -894,6 +902,7 @@ void GamePauseScreen::OnExit(UI::EventParams &e) {
if (g_Config.bPauseMenuExitsEmulator) {
System_ExitApp();
} else {
std::lock_guard<std::mutex> lock(finishNextFrameMutex_);
finishNextFrameResult_ = DR_OK; // exit game
finishNextFrame_ = true;
}