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

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-10 17:27:55 +02:00
parent 941e37a5f1 0546f9fcf3
commit ca5c4b00d7
169 changed files with 1683 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/plugins.cpp
View File

@@ -420,10 +420,12 @@ void CPlugins::startLuaPlugin(int number)
script, plugin_list[number].cfgfile.c_str());
return;
}
#ifdef ENABLE_LUA
CLuaInstance *lua = new CLuaInstance();
lua->runScript(script);
delete lua;
#if 0
#endif
#if HAVE_SPARK_HARDWARE
frameBuffer->ClearFB();
#endif
videoDecoder->Pig(-1, -1, -1, -1);