mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 21:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1322 from Siimacore/wizardthreadfix

Browse Source 
Stopping the thread in the wizard that prevented it to stop correctly
This commit is contained in:
scrawl 2017-06-13 19:48:06 +02:00 committed by GitHub
commit cd1821c464
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/wizard/unshield/unshieldworker.cpp
View File

@ -46,6 +46,7 @@ Wizard::UnshieldWorker::~UnshieldWorker()
void Wizard::UnshieldWorker::stopWorker() void Wizard::UnshieldWorker::stopWorker()
{ {
mStopped = true; mStopped = true;
mWait.wakeOne();
} }
void Wizard::UnshieldWorker::setInstallComponent(Wizard::Component component, bool install) void Wizard::UnshieldWorker::setInstallComponent(Wizard::Component component, bool install)
@ -448,6 +449,10 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
QReadLocker readLock(&mLock); QReadLocker readLock(&mLock);
emit requestFileDialog(component); emit requestFileDialog(component);
mWait.wait(&mLock); mWait.wait(&mLock);
if(mStopped) {
qDebug() << "We are asked to stop !!";
break;
}
disk.setPath(getDiskPath()); disk.setPath(getDiskPath());
} else { } else {
disk.setPath(getDiskPath()); disk.setPath(getDiskPath());