mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 00:41:09 +02:00
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
configure.ac
lib/sectionsdclient/Makefile.am
lib/timerdclient/Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1446,7 +1446,7 @@ void CMenuWidget::paintHint(int pos)
|
||||
if (details_line)
|
||||
details_line->hide();
|
||||
/* clear info box */
|
||||
if ((info_box) && (pos < 0))
|
||||
if ((info_box) && ((pos < 0) || savescreen))
|
||||
savescreen ? info_box->hide() : info_box->kill();
|
||||
if (info_box)
|
||||
hint_painted = info_box->isPainted();
|
||||
|
Reference in New Issue
Block a user