Dusk/GitAddonsManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix error dialog not appearing

Browse Source
This commit is contained in:
woblight
2024-09-21 19:28:34 +02:00
parent 50d671bc49
commit 40c8ce2b4e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
control.cpp
+8 -5
View File
@@ -112,10 +112,13 @@ void Control::delegate(QString taskname, auto work, auto callback)
m_tasks.append(old); m_tasks.append(old);
if (m_tasks.empty()) if (m_status != Status::Error) {
setStatus(Status::Ready); setStatusMessage("");
else if (!m_lock) if (m_tasks.empty())
m_tasks.dequeue().second(); setStatus(Status::Ready);
else if (!m_lock)
m_tasks.dequeue().second();
}
}); });
connect(fw, &QFutureWatcher<ret_t>::finished, fw, &QFutureWatcher<ret_t>::deleteLater); connect(fw, &QFutureWatcher<ret_t>::finished, fw, &QFutureWatcher<ret_t>::deleteLater);
fw->setFuture(fut); fw->setFuture(fut);
@@ -726,6 +729,6 @@ Control::BusyLock::BusyLock(BusyLock &&other)
Control::BusyLock::~BusyLock() Control::BusyLock::~BusyLock()
{ {
if (m_locked) if (m_locked)
if (!--count && m_locked->m_tasks.empty()) if (!--count && m_locked->m_tasks.empty() && m_locked->status() != Status::Error)
m_locked->setStatus(Status::Ready); m_locked->setStatus(Status::Ready);
} }