mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +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
------------------
Commit: 609d466302
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
This commit is contained in:
vanhofen
2017-01-30 16:32:43 +01:00
parent 1d873df948 b29b69a39b
commit e28f6df00a
11 changed files with 92 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_detailsline.cpp
View File

@@ -91,8 +91,6 @@ void CComponentsDetailLine::paint(bool do_save_bg)
//NI
if (!g_settings.show_menu_hints_line) return;
cc_save_bg = do_save_bg;
hide();
if (hasChanges())
clearFbData();