history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-19 13:15:45 -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

15
src/duckstation-sdl/sdl_host_interface.cpp
View File

@ -295,12 +295,6 @@ bool SDLHostInterface::Initialize()
if (!FileSystem::SetWorkingDirectory(m_user_directory.c_str()))
Log_ErrorPrintf("Failed to set working directory to '%s'", m_user_directory.c_str());
// Settings need to be loaded prior to creating the window for OpenGL bits.
INISettingsInterface si(GetSettingsFileName());
m_settings_copy.Load(si);
m_settings = m_settings_copy;
m_fullscreen = m_settings_copy.start_fullscreen;
if (!CreateSDLWindow())
{
Log_ErrorPrintf("Failed to create SDL window");
@ -334,6 +328,15 @@ void SDLHostInterface::Shutdown()
HostInterface::Shutdown();
}
void SDLHostInterface::LoadSettings()
{
// Settings need to be loaded prior to creating the window for OpenGL bits.
INISettingsInterface si(GetSettingsFileName());
m_settings_copy.Load(si);
m_settings = m_settings_copy;
m_fullscreen = m_settings_copy.start_fullscreen;
}
void SDLHostInterface::ReportError(const char* message)
{
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "DuckStation", message, m_window);

6
src/duckstation-sdl/sdl_host_interface.h
View File

@ -29,19 +29,21 @@ public:
void ReportMessage(const char* message) override;
bool ConfirmMessage(const char* message) override;
bool Initialize();
bool Initialize() override;
void Shutdown() override;
void Run();
protected:
void LoadSettings() override;
bool AcquireHostDisplay() override;
void ReleaseHostDisplay() override;
std::unique_ptr<AudioStream> CreateAudioStream(AudioBackend backend) override;
void OnSystemCreated() override;
void OnSystemPaused(bool paused) override;
void OnSystemDestroyed();
void OnSystemDestroyed() override;
void OnControllerTypeChanged(u32 slot) override;
private: