From 8475b03bd8f94bd61149c813d717521cd919f435 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 24 Jan 2017 16:34:08 +0100 Subject: [PATCH] ConfigManager: Always set a valid m_region Fixes a regression from f85266d that made WADs with no detectable region not boot correctly. The non-WAD code was already handling this correctly. --- Source/Core/Core/ConfigManager.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 1e96ffe261..869895dd69 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -900,7 +900,12 @@ bool SConfig::AutoSetup(EBootBS2 _BootBS2) m_region = ContentLoader.GetRegion(); const char* retrieved_region_dir = GetDirectoryForRegion(m_region); - set_region_dir = retrieved_region_dir ? retrieved_region_dir : EUR_DIR; + if (!retrieved_region_dir) + { + m_region = DiscIO::Region::PAL; + retrieved_region_dir = EUR_DIR; + } + set_region_dir = retrieved_region_dir; bWii = true; m_BootType = BOOT_WII_NAND;