mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 07:22:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


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



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-01 13:09:50 +01:00
parent bf56f9f0bc c1140e0c1c
commit 9bd8b2b10c
27 changed files with 143 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -64,7 +64,7 @@ extern CInfoIcons *InfoIcons; /* neutrino.cpp */
//NI
#include "gui/update.h"
extern CPlugins *g_PluginList;//for relodplugins
extern CPlugins *g_Plugins;//for relodplugins
extern CBouquetManager *g_bouquetManager;
#define EVENTDEV "/dev/input/input0"
@@ -2035,7 +2035,7 @@ void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh)
void CControlAPI::ReloadPluginsCGI(CyhookHandler *hh)
{
g_PluginList->loadPlugins();
g_Plugins->loadPlugins();
hh->SendOk();
}