mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/components/cc_detailsline.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 609d466302
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-30 16:32:43 +01:00
parent b8bc7ca96f 8195393c78
commit eccc57e073
11 changed files with 92 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/widget/menue.cpp
View File

@@ -1474,6 +1474,8 @@ void CMenuWidget::paintHint(int pos)
if (info_box) {
savescreen ? info_box->hide() : info_box->kill();
hint_painted = info_box->isPainted();
if (details_line)
details_line->hide();
}
return;
}