From 70a6056d496aa6ebe9a1651b524331ec07bf55cb Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <overx300@gmail.com>
Date: Wed, 16 Nov 2016 19:29:19 +0100
Subject: [PATCH] src/gui/channellist.cpp cancel paint_events thread on hide

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/f957bbaa374bc2922e561c66edb33d9e260371f2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-16 (Wed, 16 Nov 2016)


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

------------------
This commit was generated by Migit
---
 src/gui/channellist.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index d3653cd80..7c44d5bf4 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -960,14 +960,15 @@ int CChannelList::show()
 
 void CChannelList::hide()
 {
+	paint_events(-2); // cancel paint_events thread
 	if ((g_settings.channellist_additional == 2) || (previous_channellist_additional == 2)) // with miniTV
 	{
 		if (cc_minitv)
 			delete cc_minitv;
 		cc_minitv = NULL;
 	}
-
-	header->kill();
+	if(header)
+		header->kill();
 	if (CChannelLogo){
 		CChannelLogo->kill();
 		delete CChannelLogo;