mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +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/channellist.cpp
	src/gui/epgview.cpp
	src/gui/epgview.h
	src/gui/eventlist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-03 22:57:24 +02:00
parent 4a8d040937 694dd0d5e1
commit 43e622513a
11 changed files with 273 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/moviebrowser/mb.cpp
View File

@@ -2192,6 +2192,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
{
if (m_movieSelectionHandler != NULL)
{
m_header->getClockObject()->kill();
framebuffer->paintBackground(); //clear whole screen
g_EpgData->show_mp(m_movieSelectionHandler);
refresh();