Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-01 13:10:36 +01:00
27 changed files with 143 additions and 137 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;