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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
This commit is contained in:
Stefan Seyfried
2015-01-26 17:26:26 +01:00
parent b9d588128c 4defb8ea97
commit a968a12b8d
106 changed files with 6374 additions and 5374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/personalize.cpp
View File

@@ -414,27 +414,27 @@ int CPersonalizeGui::ShowPersonalizationMenu()
g_settings.plugins_lua = "";
for (int i = 0; i < pcount; i++) {
if (pltype[i] & CPlugins::P_TYPE_DISABLED) {
if (g_settings.plugins_disabled != "")
if (!g_settings.plugins_disabled.empty())
g_settings.plugins_disabled += ",";
g_settings.plugins_disabled += g_PluginList->getFileName(i);
g_PluginList->setType(i, CPlugins::P_TYPE_DISABLED);
} else if (pltype[i] & CPlugins::P_TYPE_GAME) {
if (g_settings.plugins_game != "")
if (!g_settings.plugins_game.empty())
g_settings.plugins_game += ",";
g_settings.plugins_game += g_PluginList->getFileName(i);
g_PluginList->setType(i, CPlugins::P_TYPE_GAME);
} else if (pltype[i] & CPlugins::P_TYPE_TOOL) {
if (g_settings.plugins_tool != "")
if (!g_settings.plugins_tool.empty())
g_settings.plugins_tool += ",";
g_settings.plugins_tool += g_PluginList->getFileName(i);
g_PluginList->setType(i, CPlugins::P_TYPE_TOOL);
} else if (pltype[i] & CPlugins::P_TYPE_SCRIPT) {
if (g_settings.plugins_script != "")
if (!g_settings.plugins_script.empty())
g_settings.plugins_script += ",";
g_settings.plugins_script += g_PluginList->getFileName(i);
g_PluginList->setType(i, CPlugins::P_TYPE_SCRIPT);
} else if (pltype[i] & CPlugins::P_TYPE_LUA) {
if (g_settings.plugins_lua != "")
if (!g_settings.plugins_lua.empty())
g_settings.plugins_lua += ",";
g_settings.plugins_lua += g_PluginList->getFileName(i);
g_PluginList->setType(i, CPlugins::P_TYPE_LUA);