Merge branch 'ni/tuxbox' into ni/mp/tuxbox

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


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-01 13:10:36 +01:00
27 changed files with 143 additions and 137 deletions

View File

@@ -126,10 +126,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;