diff --git a/pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp b/pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp index 20b166a014b71..7a99d79081c3e 100644 --- a/pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp +++ b/pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp @@ -55,7 +55,6 @@ MemoryCardSettingsWidget::MemoryCardSettingsWidget(SettingsWindow* dialog, QWidg SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.directory, m_ui.browse, m_ui.open, m_ui.reset, "Folders", "MemoryCards", Path::Combine(EmuFolders::DataRoot, "memcards")); - SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.autoEject, "EmuCore", "McdEnableEjection", true); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.automaticManagement, "EmuCore", "McdFolderAutoManage", true); setupAdditionalUi(); @@ -76,9 +75,6 @@ MemoryCardSettingsWidget::MemoryCardSettingsWidget(SettingsWindow* dialog, QWidg refresh(); - dialog->registerWidgetHelp(m_ui.autoEject, tr("Auto-eject Memory Cards when loading save states"), tr("Checked"), - tr("Avoids broken Memory Card saves. May not work with some games such as Guitar Hero.")); - dialog->registerWidgetHelp(m_ui.automaticManagement, tr("Automatically manage saves based on running game"), tr("Checked"), tr("(Folder type only / Card size: Auto) Loads only the relevant booted game saves, ignoring others. Avoids " diff --git a/pcsx2-qt/Settings/MemoryCardSettingsWidget.ui b/pcsx2-qt/Settings/MemoryCardSettingsWidget.ui index 27ae387d9d57e..a7122115750e7 100644 --- a/pcsx2-qt/Settings/MemoryCardSettingsWidget.ui +++ b/pcsx2-qt/Settings/MemoryCardSettingsWidget.ui @@ -185,20 +185,13 @@ Settings - + Automatically manage saves based on running game - - - - Auto-eject Memory Cards when loading save states - - - diff --git a/pcsx2/Config.h b/pcsx2/Config.h index 9ee68b253da5d..05b1308386d74 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -1298,8 +1298,6 @@ struct Pcsx2Config InhibitScreensaver : 1, BackupSavestate : 1, SavestateZstdCompression : 1, - // enables simulated ejection of memory cards when loading savestates - McdEnableEjection : 1, McdFolderAutoManage : 1, HostFs : 1, diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index ed9650c7a22e8..a9774d326a240 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -3663,8 +3663,6 @@ void FullscreenUI::DrawMemoryCardSettingsPage() DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_FOLDER_OPEN, "Memory Card Directory"), "Folders", "MemoryCards", EmuFolders::MemoryCards); DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_SEARCH, "Folder Memory Card Filter"), FSUI_CSTR("Simulates a larger memory card by filtering saves only to the current game."), "EmuCore", "McdFolderAutoManage", true); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_MAGIC, "Auto Eject When Loading"), - FSUI_CSTR("Automatically ejects Memory Cards when they differ after loading a state."), "EmuCore", "McdEnableEjection", true); for (u32 port = 0; port < NUM_MEMORY_CARD_PORTS; port++) { diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp index 583434e178710..37a16f9566fe3 100644 --- a/pcsx2/Pcsx2Config.cpp +++ b/pcsx2/Pcsx2Config.cpp @@ -1478,7 +1478,6 @@ Pcsx2Config::Pcsx2Config() { bitset = 0; // Set defaults for fresh installs / reset settings - McdEnableEjection = true; McdFolderAutoManage = true; EnablePatches = true; EnableFastBoot = true; @@ -1537,7 +1536,6 @@ void Pcsx2Config::LoadSaveCore(SettingsWrapper& wrap) SettingsWrapBitBool(BackupSavestate); SettingsWrapBitBool(SavestateZstdCompression); - SettingsWrapBitBool(McdEnableEjection); SettingsWrapBitBool(McdFolderAutoManage); SettingsWrapBitBool(WarnAboutUnsafeSettings); diff --git a/pcsx2/SIO/Sio.cpp b/pcsx2/SIO/Sio.cpp index d28618ec235e9..688fc7efe2748 100644 --- a/pcsx2/SIO/Sio.cpp +++ b/pcsx2/SIO/Sio.cpp @@ -98,7 +98,7 @@ void AutoEject::CountDownTicks() void AutoEject::Set(size_t port, size_t slot) { - if (EmuConfig.McdEnableEjection && mcds[port][slot].autoEjectTicks == 0) + if (mcds[port][slot].autoEjectTicks == 0) { mcds[port][slot].autoEjectTicks = 1; // 1 second is enough. mcds[port][slot].term = 0x55; // Reset terminator to default (0x55), forces the PS2 to recheck the memcard. diff --git a/pcsx2/VMManager.cpp b/pcsx2/VMManager.cpp index cd2056cc24c99..47a0d3afb289e 100644 --- a/pcsx2/VMManager.cpp +++ b/pcsx2/VMManager.cpp @@ -2404,7 +2404,6 @@ void VMManager::CheckForMemoryCardConfigChanges(const Pcsx2Config& old_config) } } - changed |= (EmuConfig.McdEnableEjection != old_config.McdEnableEjection); changed |= (EmuConfig.McdFolderAutoManage != old_config.McdFolderAutoManage); if (!changed)