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

Fix infinite recursion in PluginManager

Browse source
This commit is contained in:
Ryan Huffman 2016-06-21 21:39:40 -07:00
parent 4e52521f8c
commit a7f30ced29
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/plugins/src/plugins/PluginManager.cpp
View file

@ -145,8 +145,8 @@ const DisplayPluginList& PluginManager::getDisplayPlugins() {
} }
} }
for (auto plugin : displayPlugins) { for (auto plugin : displayPlugins) {
connect(plugin.get(), &Plugin::deviceConnected, this, deviceAddedCallback); connect(plugin.get(), &Plugin::deviceConnected, this, deviceAddedCallback, Qt::QueuedConnection);
connect(plugin.get(), &Plugin::subdeviceConnected, this, subdeviceAddedCallback); connect(plugin.get(), &Plugin::subdeviceConnected, this, subdeviceAddedCallback, Qt::QueuedConnection);
plugin->setContainer(_container); plugin->setContainer(_container);
plugin->init(); plugin->init();
} }
@ -193,9 +193,8 @@ const InputPluginList& PluginManager::getInputPlugins() {
} }
for (auto plugin : inputPlugins) { for (auto plugin : inputPlugins) {
UserActivityLogger::getInstance().connectedDevice("input", plugin->getName()); connect(plugin.get(), &Plugin::deviceConnected, this, deviceAddedCallback, Qt::QueuedConnection);
connect(plugin.get(), &Plugin::deviceConnected, this, deviceAddedCallback); connect(plugin.get(), &Plugin::subdeviceConnected, this, subdeviceAddedCallback, Qt::QueuedConnection);
connect(plugin.get(), &Plugin::subdeviceConnected, this, subdeviceAddedCallback);
plugin->setContainer(_container); plugin->setContainer(_container);
plugin->init(); plugin->init();
} }