mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(ModFolderPage): prevent stale profile saves during tab switching

Browse source 
Signed-off-by: Vivek Kushwaha <notvivekkushwaha@gmail.com>
This commit is contained in:
Vivek Kushwaha 2026-06-23 14:58:15 +05:30
parent f9e8dbfcc0
commit 352b45bf5e
2 changed files with 45 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

49
launcher/ui/pages/instance/ModFolderPage.cpp
View file

@ -198,7 +198,10 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, ModFolderModel* model, QWidget*
// Install viewport filter so clicking blank space in the list clears selection.
ui->treeView->viewport()->installEventFilter(this);
connect(m_profileTabBar, &QTabBar::currentChanged, this, &ModFolderPage::onProfileTabChanged);
connect(m_profileTabBar, &QTabBar::currentChanged, this, [this](int index) {
++m_profileSwitchGeneration;
applyProfileSwitch(index, m_profileSwitchGeneration);
});
connect(m_profileTabBar, &QTabBar::customContextMenuRequested,
this, &ModFolderPage::onTabContextMenuRequested);
connect(m_newTabButton, &QToolButton::clicked, this, [this] {
@ -279,30 +282,15 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, ModFolderModel* model, QWidget*
savedIndex = 0;
}
m_profileTabBar->setCurrentIndex(savedIndex);
onProfileTabChanged(m_profileTabBar->currentIndex());
applyProfileSwitch(m_profileTabBar->currentIndex(), m_profileSwitchGeneration);
connect(m_model, &ResourceFolderModel::updateFinished, this, [this]() {
qDebug().noquote().nospace()
<< "[SAVE_TRIGGER]\n"
<< "source = updateFinished\n"
<< "currentProfile = " << m_currentProfile;
if (m_profileLoading) {
m_profileLoading = false;
return;
}
saveCurrentProfileState();
});
connect(m_model, &QAbstractItemModel::dataChanged, this, [this]() {
if (!m_applyingProfile) {
qDebug().noquote().nospace()
<< "[SAVE_TRIGGER]\n"
<< "source = dataChanged\n"
<< "currentProfile = " << m_currentProfile;
saveCurrentProfileState();
});
connect(m_model, &ResourceFolderModel::updateFinished, this, [this] {
if (!m_currentProfile.isEmpty()) {
QSet<QString> expectedMods = m_profileStates.value(m_currentProfile);
compareModelToProfileState("updateFinished() FIRED", m_model, expectedMods, ++g_logSequence);
}
});
}
@ -749,7 +737,7 @@ void ModFolderPage::saveCurrentProfileState()
<< "savedModsCount:" << enabledMods.size();
}
void ModFolderPage::onProfileTabChanged(int index) {
void ModFolderPage::applyProfileSwitch(int index, int generation) {
qDebug() << "[INSTRUMENTATION]" << ++g_logSequence << "onProfileTabChanged() START"
<< "index:" << index
<< "thread:" << QThread::currentThreadId()
@ -823,7 +811,23 @@ void ModFolderPage::onProfileTabChanged(int index) {
}
compareModelToProfileState("BEFORE update()", m_model, enabledMods, ++g_logSequence);
bool started = m_model->update();
// Capture generation token. If tab changes again before this update
// completes, the token will be stale and we discard the result.
int capturedGeneration = generation;
m_applyingProfile = true;
connect(m_model, &ResourceFolderModel::updateFinished, this,
[this, capturedGeneration] {
if (capturedGeneration == m_profileSwitchGeneration) {
saveCurrentProfileState();
}
m_applyingProfile = false;
},
Qt::SingleShotConnection);
m_model->update();
qDebug().noquote().nospace()
<< "[ProfileSwitch]\n"
<< "Profile: " << tabName << "\n"
@ -842,6 +846,7 @@ void ModFolderPage::onProfileTabChanged(int index) {
setActiveProfileForModel(m_model, QStringLiteral("None"));
m_profileTabBar->setProperty("currentProfileName", QString());
m_profileLoading = false;
m_applyingProfile = false;
}
qDebug() << "[INSTRUMENTATION]" << ++g_logSequence << "onProfileTabChanged() END"
@ -1119,6 +1124,8 @@ void ModFolderPage::onTabEnableAll(int tabIndex)
{
if (m_profileTabBar->currentIndex() != tabIndex) {
m_profileTabBar->setCurrentIndex(tabIndex);
} else {
applyProfileSwitch(tabIndex, m_profileSwitchGeneration);
}
// Build the full index list and enable every mod in the active profile.
QModelIndexList allIndices;
@ -1136,6 +1143,8 @@ void ModFolderPage::onTabDisableAll(int tabIndex)
{
if (m_profileTabBar->currentIndex() != tabIndex) {
m_profileTabBar->setCurrentIndex(tabIndex);
} else {
applyProfileSwitch(tabIndex, m_profileSwitchGeneration);
}
// Build the full index list and disable every mod in the active profile.
QModelIndexList allIndices;

5
launcher/ui/pages/instance/ModFolderPage.h
View file

@ -76,7 +76,6 @@ class ModFolderPage : public ExternalResourcesPage {
void deleteModMetadata();
void exportModMetadata();
void changeModVersion();
void onProfileTabChanged(int index);
void onAddProfileClicked();
void onRemoveProfileClicked();
void saveCurrentProfileState();
@ -91,6 +90,8 @@ class ModFolderPage : public ExternalResourcesPage {
void onTabDisableAll(int tabIndex);
private:
void applyProfileSwitch(int index, int generation);
// Creates a new profile tab with the given initial mod-enable state.
// Pass an empty QSet for a blank slate; pass a copied QSet for duplication.
void createProfile(const QString& name, const QSet<QString>& initialState, int insertAfterIndex = -1);
@ -120,6 +121,8 @@ class ModFolderPage : public ExternalResourcesPage {
QString m_settingsPrefix;
bool m_destructorStarted = false;
bool m_profileLoading = false;
int m_profileSwitchGeneration = 0;
bool m_applyingProfile = false;
};
class CoreModFolderPage : public ModFolderPage {