From f9067cbf38313961799de214c5b340b6d11e90b6 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sun, 14 Jun 2015 17:03:45 +0200 Subject: [PATCH] Boot: Setting overrides should be applied after all settings from ini/movie/netplay/... are read. --- Source/Core/Core/BootManager.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index 02828d8ed1..acf70e3127 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -186,12 +186,6 @@ bool BootCore(const std::string& _rFilename) } } - // Some NTSC GameCube games such as Baten Kaitos react strangely to language settings that would be invalid on an NTSC system - if (!StartUp.bOverrideGCLanguage && StartUp.bNTSC) - { - StartUp.SelectedLanguage = 0; - } - // Wii settings if (StartUp.bWii) { @@ -262,6 +256,13 @@ bool BootCore(const std::string& _rFilename) g_SRAM_netplay_initialized = false; } + // Apply overrides + // Some NTSC GameCube games such as Baten Kaitos react strangely to language settings that would be invalid on an NTSC system + if (!StartUp.bOverrideGCLanguage && StartUp.bNTSC) + { + StartUp.SelectedLanguage = 0; + } + SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", StartUp.bProgressive); // Run the game