Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 13:17:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader

Browse Source
This commit is contained in:
Trial97
2024-08-20 00:02:14 +03:00
parent b5bbe93775 1b756b99bb
commit 4d24213aa3
40 changed files with 350 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
launcher/ui/widgets/VersionSelectWidget.cpp
View File

@ -129,16 +129,12 @@ void VersionSelectWidget::closeEvent(QCloseEvent* event)
void VersionSelectWidget::loadList()
{
auto newTask = m_vlist->getLoadTask();
if (!newTask) {
return;
}
loadTask = newTask.get();
connect(loadTask, &Task::succeeded, this, &VersionSelectWidget::onTaskSucceeded);
connect(loadTask, &Task::failed, this, &VersionSelectWidget::onTaskFailed);
connect(loadTask, &Task::progress, this, &VersionSelectWidget::changeProgress);
if (!loadTask->isRunning()) {
loadTask->start();
m_load_task = m_vlist->getLoadTask();
connect(m_load_task.get(), &Task::succeeded, this, &VersionSelectWidget::onTaskSucceeded);
connect(m_load_task.get(), &Task::failed, this, &VersionSelectWidget::onTaskFailed);
connect(m_load_task.get(), &Task::progress, this, &VersionSelectWidget::changeProgress);
if (!m_load_task->isRunning()) {
m_load_task->start();
}
sneakyProgressBar->setHidden(false);
}
@ -150,7 +146,7 @@ void VersionSelectWidget::onTaskSucceeded()
}
sneakyProgressBar->setHidden(true);
preselect();
loadTask = nullptr;
m_load_task.reset();
}
void VersionSelectWidget::onTaskFailed(const QString& reason)

2
launcher/ui/widgets/VersionSelectWidget.h
View File

@ -98,7 +98,7 @@ class VersionSelectWidget : public QWidget {
BaseVersionList* m_vlist = nullptr;
VersionProxyModel* m_proxyModel = nullptr;
int resizeOnColumn = 0;
Task* loadTask;
Task::Ptr m_load_task;
bool preselectedAlready = false;
QVBoxLayout* verticalLayout = nullptr;