mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
channellist.cpp: Fix segfault at 'delete Infobox' when changes in bouquet list.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 505d14c0a1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-09-22 (Sat, 22 Sep 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -116,7 +116,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
|
|||||||
previous_channellist_additional = -1;
|
previous_channellist_additional = -1;
|
||||||
eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT;
|
eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT;
|
||||||
dline = NULL;
|
dline = NULL;
|
||||||
ibox = new CComponentsInfoBox(x, y + height + 2, width, info_height);
|
ibox = NULL;
|
||||||
clHead = NULL;
|
clHead = NULL;
|
||||||
indexLogo = 0;
|
indexLogo = 0;
|
||||||
|
|
||||||
@@ -1547,7 +1547,8 @@ void CChannelList::paintDetails(int index)
|
|||||||
p_event = &chanlist[index]->currentEvent;
|
p_event = &chanlist[index]->currentEvent;
|
||||||
|
|
||||||
//infobox
|
//infobox
|
||||||
ibox->paint(false);
|
if (ibox)
|
||||||
|
ibox->paint(false);
|
||||||
|
|
||||||
if (!p_event->description.empty()) {
|
if (!p_event->description.empty()) {
|
||||||
char cNoch[50] = {0}; // UTF-8
|
char cNoch[50] = {0}; // UTF-8
|
||||||
@@ -1664,6 +1665,8 @@ void CChannelList::paintItem2DetailsLine (int pos)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//infobox
|
//infobox
|
||||||
|
if (ibox == NULL)
|
||||||
|
ibox = new CComponentsInfoBox(x, y + height + 2, width, info_height);
|
||||||
if (ibox){
|
if (ibox){
|
||||||
ibox->setDimensionsAll(x, ypos2, width, info_height);
|
ibox->setDimensionsAll(x, ypos2, width, info_height);
|
||||||
ibox->setFrameThickness(2);
|
ibox->setFrameThickness(2);
|
||||||
|
Reference in New Issue
Block a user