history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-04-30 14:45:43 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

CommonHostInterface: Prevent crash with fullscreen UI enabled

Browse Source
This commit is contained in:
Connor McLaughlin 2021-05-14 13:26:06 +10:00
parent dda2cccb1c
commit 1f206421e8
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/frontend-common/common_host_interface.cpp
View File

@ -2702,6 +2702,7 @@ void CommonHostInterface::LoadSettings(SettingsInterface& si)
} }
else if (m_fullscreen_ui_enabled) else if (m_fullscreen_ui_enabled)
{ {
if (FullscreenUI::IsInitialized())
FullscreenUI::UpdateSettings(); FullscreenUI::UpdateSettings();
} }

5
src/frontend-common/fullscreen_ui.cpp
View File

@ -231,6 +231,11 @@ bool Initialize(CommonHostInterface* host_interface)
return true; return true;
} }
bool IsInitialized()
{
return (s_host_interface != nullptr);
}
bool HasActiveWindow() bool HasActiveWindow()
{ {
return s_current_main_window != MainWindowType::None || s_save_state_selector_open || return s_current_main_window != MainWindowType::None || s_save_state_selector_open ||

1
src/frontend-common/fullscreen_ui.h
View File

@ -40,6 +40,7 @@ enum class SettingsPage
}; };
bool Initialize(CommonHostInterface* host_interface); bool Initialize(CommonHostInterface* host_interface);
bool IsInitialized();
bool HasActiveWindow(); bool HasActiveWindow();
void UpdateSettings(); void UpdateSettings();
void SystemCreated(); void SystemCreated();