mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +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

6
src/gui/user_menue_setup.cpp
View File

@@ -125,10 +125,10 @@ CUserMenuSetup::CUserMenuSetup(neutrino_locale_t menue_title, int menue_button)
vals[keys[loc]] = loc;
}
int number_of_plugins = g_PluginList->getNumberOfPlugins();
int number_of_plugins = g_Plugins->getNumberOfPlugins();
for (int count = 0; count < number_of_plugins; count++) {
const char *loc = g_PluginList->getName(count);
const char *key = g_PluginList->getFileName(count);
const char *loc = g_Plugins->getName(count);
const char *key = g_Plugins->getFileName(count);
if (loc && *loc && key && *key) {
options.push_back(loc);
keys[loc] = key;