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

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

Browse Source 
Conflicts:
	src/Makefile.am
	src/driver/scanepg.cpp
	src/gui/audioplayer.cpp
	src/gui/infoviewer.cpp
	src/gui/movieplayer.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 265771c9a2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-23 17:31:02 +01:00
parent f09b26a54e 2d416c2c19
commit 8acef4abf4
5 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -4065,7 +4065,7 @@ void CNeutrinoApp::ExitRun(int exit_code)
if(g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_POPUP)
InfoIcons->saveIconstate();
if(SDTreloadChannels)
if (SDTreloadChannels)
SDT_ReloadChannels();
dprintf(DEBUG_INFO, "exit\n");