Merge branch 'master' into pu/fb-modules

Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fdbe0bc68
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-11 (Sat, 11 Feb 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-11 12:01:31 +01:00

View File

@@ -77,7 +77,7 @@ int CPluginList::run()
g_PluginList->startPlugin(number);
if (!g_PluginList->getScriptOutput().empty()) {
hide();
ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL);
ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL, 320, g_settings.timing[SNeutrinoSettings::TIMING_STATIC_MESSAGES]);
}
return menu_return::RETURN_REPAINT;
}