Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2017-03-04 19:32:30 +01:00
46 changed files with 335 additions and 233 deletions

View File

@@ -65,7 +65,7 @@ extern cVideo * videoDecoder;
#include <daemonc/remotecontrol.h>
#include <gui/lua/luainstance.h>
extern CPlugins * g_PluginList; /* neutrino.cpp */
extern CPlugins * g_Plugins; /* neutrino.cpp */
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
CPlugins::CPlugins()
@@ -347,7 +347,7 @@ void CPlugins::startPlugin_by_name(const std::string & name)
{
for (int i = 0; i < (int) plugin_list.size(); i++)
{
if (name.compare(g_PluginList->getName(i)) == 0)
if (name.compare(g_Plugins->getName(i)) == 0)
{
startPlugin(i);
return;