ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

removed the concurent task destructor behaivior

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-10-22 19:58:10 +03:00
parent 0ca3873f1c
commit 2aeb829176
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/modplatform/EnsureMetadataTask.cpp
View File

@ -160,7 +160,6 @@ void EnsureMetadataTask::executeTask()
if (m_current_task) if (m_current_task)
m_current_task.reset(); m_current_task.reset();
}); });
connect(version_task.get(), &Task::failed, this, &EnsureMetadataTask::emitFailed);
if (m_mods.size() > 1) if (m_mods.size() > 1)
setStatus(tr("Requesting metadata information from %1...").arg(ProviderCaps.readableName(m_provider))); setStatus(tr("Requesting metadata information from %1...").arg(ProviderCaps.readableName(m_provider)));

14
launcher/tasks/ConcurrentTask.cpp
View File

@ -46,13 +46,9 @@ ConcurrentTask::ConcurrentTask(QObject* parent, QString task_name, int max_concu
ConcurrentTask::~ConcurrentTask() ConcurrentTask::~ConcurrentTask()
{ {
for (auto task : m_queue) { for (auto task : m_doing) {
if (task) if (task)
task->deleteLater(); task->disconnect(this);
}
for (auto task : m_done) {
if (task)
task->deleteLater();
} }
} }
@ -118,6 +114,9 @@ void ConcurrentTask::executeNextSubTask()
if (!isRunning()) { if (!isRunning()) {
return; return;
} }
if (m_doing.count() >= m_total_max_size) {
return;
}
if (m_queue.isEmpty()) { if (m_queue.isEmpty()) {
if (m_doing.isEmpty()) { if (m_doing.isEmpty()) {
if (m_failed.isEmpty()) if (m_failed.isEmpty())
@ -127,9 +126,6 @@ void ConcurrentTask::executeNextSubTask()
} }
return; return;
} }
if (m_doing.count() >= m_total_max_size) {
return;
}
startSubTask(m_queue.dequeue()); startSubTask(m_queue.dequeue());
} }