From 283021f1a237e209471c1773abd13bb9f3c539b8 Mon Sep 17 00:00:00 2001 From: Silent Date: Wed, 9 Jun 2021 19:13:07 +0200 Subject: [PATCH] Don't allow resuming from Fullscreen UI when Hardcore mode is active --- src/frontend-common/fullscreen_ui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/frontend-common/fullscreen_ui.cpp b/src/frontend-common/fullscreen_ui.cpp index 7ad0abd42..0a3ce1211 100644 --- a/src/frontend-common/fullscreen_ui.cpp +++ b/src/frontend-common/fullscreen_ui.cpp @@ -541,8 +541,9 @@ static ImGuiFullscreen::FileSelectorFilters GetDiscImageFilters() static void DoStartPath(const std::string& path, bool allow_resume) { - // we can never resume from exe/psf - if (System::IsExeFileName(path.c_str()) || System::IsPsfFileName(path.c_str())) + // we can never resume from exe/psf, or when challenge mode is active + if (System::IsExeFileName(path.c_str()) || System::IsPsfFileName(path.c_str()) || + s_host_interface->IsCheevosChallengeModeActive()) allow_resume = false; if (allow_resume && g_settings.save_state_on_exit)