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(PackProfile): overwrite update task when it has different network mode

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2026-03-19 10:54:15 +05:00
parent 04786023b0
commit cd006d642b
No known key found for this signature in database
GPG key ID: B77C34313AEE1FFF
4 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
launcher/minecraft/ComponentUpdateTask.cpp
View file

@ -74,6 +74,11 @@ bool ComponentUpdateTask::abort()
return aborted; return aborted;
} }
Net::Mode ComponentUpdateTask::netMode()
{
return d->netmode;
}
void ComponentUpdateTask::executeTask() void ComponentUpdateTask::executeTask()
{ {
qCDebug(instanceProfileResolveC) << "Loading components"; qCDebug(instanceProfileResolveC) << "Loading components";

1
launcher/minecraft/ComponentUpdateTask.h
View file

@ -19,6 +19,7 @@ class ComponentUpdateTask : public Task {
bool canAbort() const override; bool canAbort() const override;
bool abort() override; bool abort() override;
Net::Mode netMode();
protected: protected:
void executeTask() override; void executeTask() override;

10
launcher/minecraft/PackProfile.cpp
View file

@ -326,7 +326,15 @@ PackProfile::Result PackProfile::reload(Net::Mode netmode)
{ {
// Do not reload when the update/resolve task is running. It is in control. // Do not reload when the update/resolve task is running. It is in control.
if (d->m_updateTask) { if (d->m_updateTask) {
return Result::Success(); if (d->m_updateTask->netMode() == netmode) {
return Result::Success();
}
// https://github.com/PrismLauncher/PrismLauncher/issues/5209
// FIXME: HACK HACK HACK
disconnect(d->m_updateTask.get(), &ComponentUpdateTask::aborted, nullptr, nullptr);
d->m_updateTask->abort();
d->m_updateTask.reset();
} }
// flush any scheduled saves to not lose state // flush any scheduled saves to not lose state

2
launcher/minecraft/PackProfile_p.h
View file

@ -22,7 +22,7 @@ struct PackProfileData {
ComponentIndex componentIndex; ComponentIndex componentIndex;
bool dirty = false; bool dirty = false;
QTimer m_saveTimer; QTimer m_saveTimer;
Task::Ptr m_updateTask; shared_qobject_ptr<ComponentUpdateTask> m_updateTask;
bool loaded = false; bool loaded = false;
bool interactionDisabled = true; bool interactionDisabled = true;
}; };