From 144fbcba14f382a15c256347a23a548ebfe02ba8 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <overx300@gmail.com>
Date: Fri, 17 Feb 2017 11:09:53 +0100
Subject: [PATCH 1/2] src/driver/scanepg.cpp avoid possible segfault

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/4bfe34bf5dbaa005db9cf2b7c82bbd5942f486f7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-17 (Fri, 17 Feb 2017)
---
 src/driver/scanepg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/driver/scanepg.cpp b/src/driver/scanepg.cpp
index bd903b162..586c9023a 100644
--- a/src/driver/scanepg.cpp
+++ b/src/driver/scanepg.cpp
@@ -160,7 +160,7 @@ bool CEpgScan::AddSelected()
 
 void CEpgScan::AddTransponders()
 {
-	if(bouquetList->Bouquets.empty())
+	if(!bouquetList || bouquetList->Bouquets.empty())
 		return;
 
 	if (current_mode != g_settings.epg_scan) {

From fdf8abc174f61094789fa31da11310397c78f8f8 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <overx300@gmail.com>
Date: Fri, 17 Feb 2017 12:11:03 +0100
Subject: [PATCH 2/2] try to fix segfault with --enable-cleanup

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/e908858c1902ca8d4f523a842b3a3c95ce3f4264
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-17 (Fri, 17 Feb 2017)
---
 src/gui/movieplayer.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 0fda64768..893508633 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -118,17 +118,24 @@ CMoviePlayerGui::CMoviePlayerGui()
 
 CMoviePlayerGui::~CMoviePlayerGui()
 {
-	//playback->Close();
 	if (this == instance_mp)
 		stopPlayBack();
-	delete moviebrowser;
-	moviebrowser = NULL;
-	delete filebrowser;
-	filebrowser = NULL;
-	delete bookmarkmanager;
-	bookmarkmanager = NULL;
-	delete playback;
-	playback = NULL;
+	if(moviebrowser){
+		delete moviebrowser;
+		moviebrowser = NULL;
+	}
+	if(filebrowser){
+		delete filebrowser;
+		filebrowser = NULL;
+	}
+	if(bookmarkmanager){
+		delete bookmarkmanager;
+		bookmarkmanager = NULL;
+	}
+	if(playback){
+		delete playback;
+		playback = NULL;
+	}
 	if (this == instance_mp) {
 		delete instance_bg;
 		instance_bg = NULL;