From da832d9671261966f9170cfa1af6cecfb699806b Mon Sep 17 00:00:00 2001 From: Markus Wick Date: Sat, 15 Aug 2015 21:25:23 +0200 Subject: [PATCH] Merge pull request #2852 from aserna3/master Changed GC adapter "Direct Connect" to false by default Conflicts: Source/Core/Core/ConfigManager.cpp --- Source/Core/Core/ConfigManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 7d7323bd54..98cfa458a7 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -473,7 +473,7 @@ void SConfig::LoadCoreSettings(IniFile& ini) core->Get("FrameSkip", &m_FrameSkip, 0); core->Get("GFXBackend", &m_LocalCoreStartupParameter.m_strVideoBackend, ""); core->Get("GPUDeterminismMode", &m_LocalCoreStartupParameter.m_strGPUDeterminismMode, "auto"); - core->Get("GameCubeAdapter", &m_GameCubeAdapter, true); + core->Get("GameCubeAdapter", &m_GameCubeAdapter, false); core->Get("AdapterRumble", &m_AdapterRumble, true); }