krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

InstallationPage: properly exit the QThread (Fixes #2210)

Browse source
This commit is contained in:
scrawl 2015-12-08 21:41:35 +01:00
parent 1264651af7
commit 2f9b404094
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/wizard/installationpage.cpp
View file

@ -28,12 +28,6 @@ Wizard::InstallationPage::InstallationPage(QWidget *parent) :
connect(mUnshield, SIGNAL(finished()), connect(mUnshield, SIGNAL(finished()),
mThread, SLOT(quit())); mThread, SLOT(quit()));
connect(mUnshield, SIGNAL(finished()),
mUnshield, SLOT(deleteLater()));
connect(mUnshield, SIGNAL(finished()),
mThread, SLOT(deleteLater()));;
connect(mUnshield, SIGNAL(finished()), connect(mUnshield, SIGNAL(finished()),
this, SLOT(installationFinished()), Qt::QueuedConnection); this, SLOT(installationFinished()), Qt::QueuedConnection);
@ -60,6 +54,7 @@ Wizard::InstallationPage::~InstallationPage()
{ {
if (mThread->isRunning()) { if (mThread->isRunning()) {
mUnshield->stopWorker(); mUnshield->stopWorker();
mThread->quit();
mThread->wait(); mThread->wait();
} }

2
apps/wizard/unshield/unshieldworker.cpp
View file

@ -45,9 +45,7 @@ Wizard::UnshieldWorker::~UnshieldWorker()
void Wizard::UnshieldWorker::stopWorker() void Wizard::UnshieldWorker::stopWorker()
{ {
mMutex.lock();
mStopped = true; mStopped = true;
mMutex.unlock();
} }
void Wizard::UnshieldWorker::setInstallComponent(Wizard::Component component, bool install) void Wizard::UnshieldWorker::setInstallComponent(Wizard::Component component, bool install)

1
apps/wizard/unshield/unshieldworker.hpp
View file

@ -104,7 +104,6 @@ namespace Wizard
QTextCodec *mIniCodec; QTextCodec *mIniCodec;
QWaitCondition mWait; QWaitCondition mWait;
QMutex mMutex;
QReadWriteLock mLock; QReadWriteLock mLock;