summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorshuffle2 <godisgovernment@gmail.com>2017-06-05 21:56:04 -0700
committerGitHub <noreply@github.com>2017-06-05 21:56:04 -0700
commit367fba8e063dbb1b7ebaea8adc1ef95b2fe73965 (patch)
treed26958cbaee3e82abed951f0f4ea7ce1bb3269de /Source
parent442e614021462e6464628c74d6fafceaf7627fa1 (diff)
parentc6a90c95be09aee7844091f9d0bbe02ffee4eda8 (diff)
Merge pull request #5199 from ligfx/default_gci_folder
Make EXIDEVICE_MEMORYCARDFOLDER the default for slot A
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/ConfigManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
index 4badc20a09..9471ab7a5a 100644
--- a/Source/Core/Core/ConfigManager.cpp
+++ b/Source/Core/Core/ConfigManager.cpp
@@ -569,7 +569,7 @@ void SConfig::LoadCoreSettings(IniFile& ini)
core->Get("MemcardBPath", &m_strMemoryCardB);
core->Get("AgpCartAPath", &m_strGbaCartA);
core->Get("AgpCartBPath", &m_strGbaCartB);
- core->Get("SlotA", (int*)&m_EXIDevice[0], ExpansionInterface::EXIDEVICE_MEMORYCARD);
+ core->Get("SlotA", (int*)&m_EXIDevice[0], ExpansionInterface::EXIDEVICE_MEMORYCARDFOLDER);
core->Get("SlotB", (int*)&m_EXIDevice[1], ExpansionInterface::EXIDEVICE_NONE);
core->Get("SerialPort1", (int*)&m_EXIDevice[2], ExpansionInterface::EXIDEVICE_NONE);
core->Get("BBA_MAC", &m_bba_mac);