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 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c8ea9793f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-06 (Thu, 06 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-06 21:18:48 +02:00
parent e6ea52135d e236578f8d
commit e4656e148b
20 changed files with 220 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/plugins.cpp
View File

@@ -427,9 +427,11 @@ 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;
#endif
#if HAVE_SPARK_HARDWARE
frameBuffer->ClearFB();
#endif