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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-03 10:38:14 +01:00
parent 0e588328e0 7d68b0c284
commit 3d3e8163b8
18 changed files with 160 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/neutrino.cpp
View File

@@ -527,6 +527,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
if (timer_remotebox_itemcount) {
for (int i = 0; i < timer_remotebox_itemcount; i++) {
timer_remotebox_item timer_rb;
timer_rb.online = false;
timer_rb.port = 0;
std::string k;
k = "timer_remotebox_ip_" + to_string(i);
timer_rb.rbaddress = configfile.getString(k, "");
@@ -4764,9 +4766,10 @@ void stop_daemons(bool stopall, bool for_flash)
if(!for_flash && !stopall && g_settings.hdmi_cec_mode && g_settings.hdmi_cec_standby){
videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0);
}
delete InfoClock;
delete FileTimeOSD;
if(InfoClock)
delete InfoClock;
if(FileTimeOSD)
delete FileTimeOSD;
delete &CMoviePlayerGui::getInstance();
CZapit::getInstance()->Stop();