From af623fc18aa28a5131ea5f21244955dcb1a048de Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 8 Apr 2017 15:47:38 +0200 Subject: [PATCH 1/2] epgplus: fix detailsline; codeblock was removed by mistake Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/15b028d187f4b52ebeeac42f5d86ff5ceab81972 Author: vanhofen Date: 2017-04-08 (Sat, 08 Apr 2017) Origin message was: ------------------ - epgplus: fix detailsline; codeblock was removed by mistake --- src/gui/epgplus.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 5c84e62df..a782ea8b5 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -425,6 +425,14 @@ void EpgPlus::ChannelEntry::paint(bool isSelected, time_t _selectedTime) toggleColor = !toggleColor; } + // kill detailsline + if (detailsLine) + { + detailsLine->kill(); + delete detailsLine; + detailsLine = NULL; + } + // paint detailsline if (isSelected) { From f8bd6bd876d722b2eed3cf2b58fe356d79024db7 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sat, 8 Apr 2017 16:25:59 +0200 Subject: [PATCH 2/2] epgplus: fix detailsline; Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/c26e85cb554527e797dc06c652127880bd8c4053 Author: TangoCash Date: 2017-04-08 (Sat, 08 Apr 2017) Origin message was: ------------------ - epgplus: fix detailsline; --- src/gui/epgplus.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index a782ea8b5..3c82f4937 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -365,6 +365,7 @@ EpgPlus::ChannelEntry::~ChannelEntry() if (this->detailsLine) { + this->detailsLine->kill(); delete this->detailsLine; this->detailsLine = NULL; }