From dd48917b6d4f2b028f57b8fb8f086f58a9c9473b Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sat, 22 Sep 2012 05:52:24 +0200 Subject: [PATCH] channellist.cpp: Fix segfault at 'delete Infobox' when changes in bouquet list. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/505d14c0a18e9d9c36831a6c873087a54c2e875f Author: Michael Liebmann Date: 2012-09-22 (Sat, 22 Sep 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index e85277be6..bb8d820b6 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -116,7 +116,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl previous_channellist_additional = -1; eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT; dline = NULL; - ibox = new CComponentsInfoBox(x, y + height + 2, width, info_height); + ibox = NULL; clHead = NULL; indexLogo = 0; @@ -1547,7 +1547,8 @@ void CChannelList::paintDetails(int index) p_event = &chanlist[index]->currentEvent; //infobox - ibox->paint(false); + if (ibox) + ibox->paint(false); if (!p_event->description.empty()) { char cNoch[50] = {0}; // UTF-8 @@ -1664,6 +1665,8 @@ void CChannelList::paintItem2DetailsLine (int pos) } //infobox + if (ibox == NULL) + ibox = new CComponentsInfoBox(x, y + height + 2, width, info_height); if (ibox){ ibox->setDimensionsAll(x, ypos2, width, info_height); ibox->setFrameThickness(2);