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

Merge branch 'possible-fix-for-domain-server-crash' of github.com:sethalves/hifi into ac-client

Browse source
This commit is contained in:
Seth Alves 2016-10-05 19:36:59 -07:00
commit 7b5106afd8
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/shared/src/SettingInterface.cpp
View file

@ -34,7 +34,6 @@ namespace Setting {
DependencyManager::destroy<Manager>();
//
globalManager->deleteLater();
globalManager.reset();
// quit the settings manager thread and wait on it to make sure it's gone
@ -72,9 +71,9 @@ namespace Setting {
globalManager = DependencyManager::set<Manager>();
QObject::connect(globalManager.data(), SIGNAL(destroyed()), thread, SLOT(quit()));
QObject::connect(thread, SIGNAL(started()), globalManager.data(), SLOT(startTimer()));
QObject::connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
QObject::connect(thread, SIGNAL(finished()), globalManager.data(), SLOT(deleteLater()));
globalManager->moveToThread(thread);
thread->start();
qCDebug(shared) << "Settings thread started.";