From ac0deff9b24f84d0a0f385cf02e7ad4ef67cb214 Mon Sep 17 00:00:00 2001 From: JordanTheToaster Date: Thu, 15 Jan 2026 21:56:05 +0000 Subject: [PATCH] Memcard: Purge automatic save management --- pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp | 6 ------ pcsx2-qt/Settings/MemoryCardSettingsWidget.h | 1 + pcsx2-qt/Settings/MemoryCardSettingsWidget.ui | 17 ----------------- pcsx2/Config.h | 1 - pcsx2/Pcsx2Config.cpp | 2 -- pcsx2/SIO/Memcard/MemoryCardFile.cpp | 6 +++--- pcsx2/VMManager.cpp | 2 -- 7 files changed, 4 insertions(+), 31 deletions(-) diff --git a/pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp b/pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp index c93f03ab4e..179ba763df 100644 --- a/pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp +++ b/pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp @@ -40,7 +40,6 @@ MemoryCardSettingsWidget::MemoryCardSettingsWidget(SettingsWindow* settings_dial 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.automaticManagement, "EmuCore", "McdFolderAutoManage", true); setupAdditionalUi(); @@ -58,11 +57,6 @@ MemoryCardSettingsWidget::MemoryCardSettingsWidget(SettingsWindow* settings_dial connect(m_ui.deleteCard, &QPushButton::clicked, this, &MemoryCardSettingsWidget::deleteCard); refresh(); - - 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 " - "running out of space for saves.")); } MemoryCardSettingsWidget::~MemoryCardSettingsWidget() = default; diff --git a/pcsx2-qt/Settings/MemoryCardSettingsWidget.h b/pcsx2-qt/Settings/MemoryCardSettingsWidget.h index 59c4021649..0254f59e14 100644 --- a/pcsx2-qt/Settings/MemoryCardSettingsWidget.h +++ b/pcsx2-qt/Settings/MemoryCardSettingsWidget.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/pcsx2-qt/Settings/MemoryCardSettingsWidget.ui b/pcsx2-qt/Settings/MemoryCardSettingsWidget.ui index 67cc139ae4..d6fa86c679 100644 --- a/pcsx2-qt/Settings/MemoryCardSettingsWidget.ui +++ b/pcsx2-qt/Settings/MemoryCardSettingsWidget.ui @@ -175,22 +175,6 @@ - - - - Settings - - - - - - Automatically manage saves based on running game - - - - - - @@ -211,7 +195,6 @@ renameCard convertCard deleteCard - automaticManagement diff --git a/pcsx2/Config.h b/pcsx2/Config.h index 94764e7b0f..a81113edf5 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -1326,7 +1326,6 @@ struct Pcsx2Config UseSavestateSelector : 1, InhibitScreensaver : 1, BackupSavestate : 1, - McdFolderAutoManage : 1, ManuallySetRealTimeClock : 1, // passes user-set real-time clock information to cdvd at startup UseSystemLocaleFormat : 1, // presents OS time format instead of yyyy-MM-dd HH:mm:ss for manual RTC diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp index c0adab7e72..95b91daae0 100644 --- a/pcsx2/Pcsx2Config.cpp +++ b/pcsx2/Pcsx2Config.cpp @@ -1923,7 +1923,6 @@ Pcsx2Config::Pcsx2Config() { bitset = 0; // Set defaults for fresh installs / reset settings - McdFolderAutoManage = true; EnablePatches = true; EnableFastBoot = true; EnableRecordingTools = true; @@ -1979,7 +1978,6 @@ void Pcsx2Config::LoadSaveCore(SettingsWrapper& wrap) SettingsWrapBitBool(HostFs); SettingsWrapBitBool(BackupSavestate); - SettingsWrapBitBool(McdFolderAutoManage); SettingsWrapBitBool(WarnAboutUnsafeSettings); diff --git a/pcsx2/SIO/Memcard/MemoryCardFile.cpp b/pcsx2/SIO/Memcard/MemoryCardFile.cpp index de6501fcb4..32a34ee490 100644 --- a/pcsx2/SIO/Memcard/MemoryCardFile.cpp +++ b/pcsx2/SIO/Memcard/MemoryCardFile.cpp @@ -611,7 +611,7 @@ void FileMcd_EmuOpen() Mcd::impl.Open(); - Mcd::implFolder.SetFiltering(EmuConfig.McdFolderAutoManage); + Mcd::implFolder.SetFiltering(true); Mcd::implFolder.Open(); } @@ -823,7 +823,7 @@ int FileMcd_ReIndex(uint port, uint slot, const std::string& filter) // return Mcd::impl.ReIndex( combinedSlot, filter ); // break; case MemoryCardType::Folder: - if (!Mcd::implFolder.ReIndex(combinedSlot, EmuConfig.McdFolderAutoManage, filter)) + if (!Mcd::implFolder.ReIndex(combinedSlot, true, filter)) return -1; break; default: @@ -930,7 +930,7 @@ std::vector FileMcd_GetAvailableCards(bool include_in_use_card Pcsx2Config::McdOptions config; config.Enabled = true; config.Type = MemoryCardType::Folder; - sourceFolderMemoryCard.Open(fd.FileName, config, (8 * 1024 * 1024) / FolderMemoryCard::ClusterSize, EmuConfig.McdFolderAutoManage, ""); + sourceFolderMemoryCard.Open(fd.FileName, config, (8 * 1024 * 1024) / FolderMemoryCard::ClusterSize, true, ""); mcds.push_back({std::move(basename), std::move(fd.FileName), fd.ModificationTime, MemoryCardType::Folder, MemoryCardFileType::Unknown, 0u, sourceFolderMemoryCard.IsFormatted()}); diff --git a/pcsx2/VMManager.cpp b/pcsx2/VMManager.cpp index dfce6797a2..f145b5b833 100644 --- a/pcsx2/VMManager.cpp +++ b/pcsx2/VMManager.cpp @@ -2993,8 +2993,6 @@ void VMManager::CheckForMemoryCardConfigChanges(const Pcsx2Config& old_config) } } - changed |= (EmuConfig.McdFolderAutoManage != old_config.McdFolderAutoManage); - if (!changed) return;