flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 21:56:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't assert if CPluginManagerSimulator::createListener returns nullptr

Browse Source 
CPluginManagerSimulator::createListener returns nullptr if no
listener could be created, e.g. because the plugin could not be loaded
due to missing dependencies. Handle this scenario properly instead of
raising an assert.

refs #669
This commit is contained in:
Roland Winklmeier
2016-07-26 13:38:18 +02:00
parent 04013d0747
commit 7a9577efef
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/pluginmanagersimulator.cpp
View File

@@ -11,6 +11,7 @@
#include "blackcore/pluginmanagersimulator.h"
#include "blackcore/simulator.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/logmessage.h"
#include <QJsonObject>
#include <QJsonValue>
@@ -42,9 +43,10 @@ namespace BlackCore
PluginExtended &plugin = m_plugins[pluginId];
if (!plugin.listener)
{
ISimulatorFactory *factory = getPluginById<ISimulatorFactory>(pluginId);
ISimulatorFactory *factory = getFactory(pluginId);
if (!factory)
{
CLogMessage(this).warning("Could not load plugin %1.") << pluginId;
m_plugins.remove(pluginId);
return nullptr;
}