Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 18:32:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

karchivemanager: interrupt thread and wait for it to finish from KArchiveModel destructor

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-17 14:30:31 +03:00
parent bc53a4961f
commit 04caf1c1ff
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
karchivemanager/karchivemanager.cpp
View file

@ -84,7 +84,8 @@ protected:
KArchiveModelPrivate::KArchiveModelPrivate(QObject *parent) KArchiveModelPrivate::KArchiveModelPrivate(QObject *parent)
: QThread(parent), : QThread(parent),
m_interrupt(false) { m_interrupt(false)
{
} }
// because altering paths is not easy // because altering paths is not easy
@ -182,7 +183,7 @@ void KArchiveModelPrivate::run()
m_interrupt = false; m_interrupt = false;
foreach (const KArchiveEntry &info, m_list) { foreach (const KArchiveEntry &info, m_list) {
if(m_interrupt) { if (m_interrupt) {
return; return;
} }
@ -207,9 +208,11 @@ KArchiveModel::KArchiveModel(QObject *parent)
KArchiveModel::~KArchiveModel() KArchiveModel::~KArchiveModel()
{ {
if (d) { if (d->isRunning()) {
delete d; d->requestInterruption();
d->wait();
} }
delete d;
} }
bool KArchiveModel::loadArchive(const KArchive *archive) bool KArchiveModel::loadArchive(const KArchive *archive)