Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1664 from ZappoMan/bugfixes

Browse source 
fix random crash on interface shutdown
This commit is contained in:
Stephen Birarda 2014-01-23 16:25:07 -08:00
commit 000bbccdf0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/shared/src/GenericThread.cpp
View file

@ -20,7 +20,10 @@ GenericThread::GenericThread() :
}
GenericThread::~GenericThread() {
terminate();
// we only need to call terminate() if we're actually threaded and still running
if (isStillRunning() && isThreaded()) {
terminate();
}
}
void GenericThread::initialize(bool isThreaded) {
@ -45,6 +48,7 @@ void GenericThread::terminate() {
if (_thread) {
_thread->wait();
_thread->deleteLater();
_thread = NULL;
}
}
}