Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2017-03-04 19:32:30 +01:00
46 changed files with 335 additions and 233 deletions

View File

@@ -77,7 +77,7 @@ int COsdLangSetup::exec(CMenuTarget* parent, const std::string &actionKey)
if (!actionKey.empty()) {
g_settings.language = actionKey;
g_PluginList->loadPlugins();
g_Plugins->loadPlugins();
g_Locale->loadLocale(g_settings.language.c_str());
return menu_return::RETURN_EXIT;
}