Merge pull request #1322 from Siimacore/wizardthreadfix

Stopping the thread in the wizard that prevented it to stop correctly
pull/228/head
scrawl 8 years ago committed by GitHub
commit cd1821c464

@ -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());

Loading…
Cancel
Save