Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: 2661fa4287
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-10-08 18:03:01 +02:00
3 changed files with 7 additions and 10 deletions

View File

@@ -1454,10 +1454,8 @@ void CMenuWidget::enableSaveScreen(bool enable)
void CMenuWidget::paintHint(int pos)
{
if (!g_settings.show_menu_hints){
//ResetModules(); //ensure clean up on changed setting
if (!g_settings.show_menu_hints)
return;
}
if (pos < 0 && !hint_painted)
return;