Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 15:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Achievements: Fix crash when toggling off with list open

Browse source
This commit is contained in:
Connor McLaughlin 2022-09-21 22:58:18 +10:00
parent 5568de1e03
commit 065472ddda
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/frontend-common/common_host.cpp
View file

@ -372,6 +372,8 @@ void CommonHost::CheckForSettingsChanges(const Settings& old_settings)
Achievements::UpdateSettings(old_settings); Achievements::UpdateSettings(old_settings);
#endif #endif
FullscreenUI::CheckForConfigChanges(old_settings);
if (g_settings.log_level != old_settings.log_level || g_settings.log_filter != old_settings.log_filter || if (g_settings.log_level != old_settings.log_level || g_settings.log_filter != old_settings.log_filter ||
g_settings.log_to_console != old_settings.log_to_console || g_settings.log_to_console != old_settings.log_to_console ||
g_settings.log_to_debug != old_settings.log_to_debug || g_settings.log_to_window != old_settings.log_to_window || g_settings.log_to_debug != old_settings.log_to_debug || g_settings.log_to_window != old_settings.log_to_window ||

13
src/frontend-common/fullscreen_ui.cpp
View file

@ -578,6 +578,19 @@ bool FullscreenUI::HasActiveWindow()
ImGuiFullscreen::IsChoiceDialogOpen() || ImGuiFullscreen::IsFileSelectorOpen()); ImGuiFullscreen::IsChoiceDialogOpen() || ImGuiFullscreen::IsFileSelectorOpen());
} }
void FullscreenUI::CheckForConfigChanges(const Settings& old_settings)
{
if (!IsInitialized())
return;
#ifdef WITH_CHEEVOS
// If achievements got disabled, we might have the menu open...
// That means we're going to be reading achievement state.
if (old_settings.achievements_enabled && !g_settings.achievements_enabled)
ReturnToMainWindow();
#endif
}
void FullscreenUI::OnSystemStarted() void FullscreenUI::OnSystemStarted()
{ {
if (!IsInitialized()) if (!IsInitialized())

3
src/frontend-common/fullscreen_ui.h
View file

@ -6,10 +6,13 @@
class HostDisplayTexture; class HostDisplayTexture;
struct Settings;
namespace FullscreenUI { namespace FullscreenUI {
bool Initialize(); bool Initialize();
bool IsInitialized(); bool IsInitialized();
bool HasActiveWindow(); bool HasActiveWindow();
void CheckForConfigChanges(const Settings& old_settings);
void OnSystemStarted(); void OnSystemStarted();
void OnSystemPaused(); void OnSystemPaused();
void OnSystemResumed(); void OnSystemResumed();