diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-04-18 16:45:58 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-04-18 16:45:58 +0200 |
| commit | 5565a2f85e8b7a4b0e4758b5b6f4d806b964cf94 (patch) | |
| tree | eff9e090c9f2a7dd66feb04e08226f7e74017689 /api/logic/java/JavaInstallList.cpp | |
| parent | c4c8e99681e14e5d0e82a13cb0631107dedf96ff (diff) | |
| download | PrismLauncher-5565a2f85e8b7a4b0e4758b5b6f4d806b964cf94.tar.gz PrismLauncher-5565a2f85e8b7a4b0e4758b5b6f4d806b964cf94.tar.bz2 PrismLauncher-5565a2f85e8b7a4b0e4758b5b6f4d806b964cf94.zip | |
NOISSUE fix crash because of early destruction of java list load task
Diffstat (limited to 'api/logic/java/JavaInstallList.cpp')
| -rw-r--r-- | api/logic/java/JavaInstallList.cpp | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/api/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp index dbf66f5f..44ac861d 100644 --- a/api/logic/java/JavaInstallList.cpp +++ b/api/logic/java/JavaInstallList.cpp @@ -31,7 +31,27 @@ JavaInstallList::JavaInstallList(QObject *parent) : BaseVersionList(parent) shared_qobject_ptr<Task> JavaInstallList::getLoadTask() { - return new JavaListLoadTask(this); + load(); + return getCurrentTask(); +} + +shared_qobject_ptr<Task> JavaInstallList::getCurrentTask() +{ + if(m_status == Status::InProgress) + { + return m_loadTask; + } + return nullptr; +} + +void JavaInstallList::load() +{ + if(m_status != Status::InProgress) + { + m_status = Status::InProgress; + m_loadTask = new JavaListLoadTask(this); + m_loadTask->start(); + } } const BaseVersionPtr JavaInstallList::at(int i) const @@ -41,7 +61,7 @@ const BaseVersionPtr JavaInstallList::at(int i) const bool JavaInstallList::isLoaded() { - return m_loaded; + return m_status == JavaInstallList::Status::Done; } int JavaInstallList::count() const @@ -87,7 +107,6 @@ void JavaInstallList::updateListData(QList<BaseVersionPtr> versions) { beginResetModel(); m_vlist = versions; - m_loaded = true; sortVersions(); if(m_vlist.size()) { @@ -95,6 +114,8 @@ void JavaInstallList::updateListData(QList<BaseVersionPtr> versions) best->recommended = true; } endResetModel(); + m_status = Status::Done; + m_loadTask.reset(); } bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) |