history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-12 19:25:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

HostInterface: Fix crash on startup with controller connected

Browse Source
This commit is contained in:
Connor McLaughlin
2020-04-06 12:18:33 +10:00
parent f41475ae8f
commit e91d760175
8 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/host_interface.cpp
View File

@ -61,6 +61,7 @@ bool HostInterface::Initialize()
{
SetUserDirectory();
InitializeUserDirectory();
LoadSettings();
m_game_list = std::make_unique<GameList>();
m_game_list->SetCacheFilename(GetGameListCacheFileName());
m_game_list->SetDatabaseFilename(GetGameListDatabaseFileName());

4
src/core/host_interface.h
View File

@ -158,8 +158,8 @@ protected:
/// Sets the base path for the user directory. Can be overridden by platform/frontend/command line.
virtual void SetUserDirectory();
/// Ensures all subdirectories of the user directory are created.
void CreateUserDirectorySubdirectories();
/// Performs the initial load of settings. Should call CheckSettings() and m_settings.Load().
virtual void LoadSettings() = 0;
/// Returns the path of the settings file.
std::string GetSettingsFileName() const;