From d12ea80c5b6607657ffc8fdd74e9c0345f3c4d2b Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <satbaby@kawaii.com>
Date: Wed, 1 Mar 2017 15:04:10 +0100
Subject: [PATCH] src/neutrino.cpp init struct timer_remotebox_item, avoid
 segfault without InfoClock

---
 src/neutrino.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 08b728cdd..fe94460d2 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -468,6 +468,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	if (timer_remotebox_itemcount) {
 		for (int i = 0; i < timer_remotebox_itemcount; i++) {
 			timer_remotebox_item timer_rb;
+			memset(&timer_rb, 0, sizeof(struct timer_remotebox_item));
 			std::string k;
 			k = "timer_remotebox_ip_" + to_string(i);
 			timer_rb.rbaddress = configfile.getString(k, "");
@@ -4237,9 +4238,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();