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

@@ -56,7 +56,7 @@ extern CPictureViewer *g_PicViewer;
extern cVideo * videoDecoder;
extern CPlugins *g_PluginList;//for relodplugins
extern CPlugins *g_Plugins;//for relodplugins
extern CBouquetManager *g_bouquetManager;
#define EVENTDEV "/dev/input/input0"
@@ -2030,7 +2030,7 @@ void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh)
void CControlAPI::ReloadPluginsCGI(CyhookHandler *hh)
{
g_PluginList->loadPlugins();
g_Plugins->loadPlugins();
hh->SendOk();
}