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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/epgview.cpp
	src/gui/infoviewer.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f49da45cc7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-02 11:43:59 +02:00
parent de162753a5 97b471ebcf
commit 45df54a682
4 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/infoviewer.cpp
View File

@@ -1087,7 +1087,7 @@ void CInfoViewer::loop(bool show_dot)
}
else
#endif
g_RCInput->postMsg (NeutrinoMessages::SHOW_EPG, 0);
g_RCInput->postMsg (NeutrinoMessages::SHOW_EPG, 0);
res = messages_return::cancel_info;
} else if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {
if(fader.FadeDone())