Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent deadlock on changing plugins

Browse source
This commit is contained in:
Bradley Austin Davis 2016-07-29 15:15:51 -07:00 committed by Brad Davis
parent d0912c6063
commit 13d7715c41
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/ui-plugins/src/ui-plugins/PluginContainer.cpp
View file

@ -8,6 +8,7 @@
#include "PluginContainer.h"
#include <QtCore/QTimer>
#include <QtCore/QThread>
#include <QtGui/QScreen>
#include <QtGui/QWindow>
#include <QtWidgets/QApplication>
@ -162,6 +163,8 @@ void PluginContainer::setBoolSetting(const QString& settingName, bool value) {
}
bool isRenderThread() {
return QThread::currentThread() != qApp->thread();
// FIXME causes a deadlock on switching display plugins
auto displayPlugin = PluginContainer::getInstance().getActiveDisplayPlugin();
return displayPlugin && displayPlugin->isRenderThread();
}