mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix possible segfault in channallist

Browse Source 
fix segfaut channallist in movieplayer mode with active minitv


Origin commit data
------------------
Branch: ni/coolstream
Commit: 88b92d3d90
Author: defans <defans@bluepeercrew.us>
Date: 2013-10-09 (Wed, 09 Oct 2013)



------------------
This commit was generated by Migit
This commit is contained in:
defans
2013-10-09 00:19:11 +02:00
committed by vanhofen
parent e7b1618dab
commit da34f33c46
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/channellist.cpp
View File

@@ -121,6 +121,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
dline = NULL;
cc_minitv = NULL;
logo_off = 0;
pig_on_win = false;
//printf("************ NEW LIST %s : %x\n", name.c_str(), (int) this);fflush(stdout);
}
@@ -535,7 +536,7 @@ void CChannelList::calcSize()
fheight = 1; /* avoid div-by-zero crash on invalid font */
footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6;
bool pig_on_win = ( (g_settings.channellist_additional == 2) /* with miniTV */ && (CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_ts) );
pig_on_win = ( (g_settings.channellist_additional == 2) /* with miniTV */ && (CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_ts) );
// calculate width
full_width = pig_on_win ? (frameBuffer->getScreenWidth()-2*ConnectLineBox_Width) : frameBuffer->getScreenWidthRel();
@@ -2150,7 +2151,7 @@ void CChannelList::paint()
liststart = (selected/listmaxshow)*listmaxshow;
updateEvents(this->historyMode ? 0:liststart, this->historyMode ? 0:(liststart + listmaxshow));
if (g_settings.channellist_additional == 2) // with miniTV
if (pig_on_win) // with miniTV
paintPig(x+width, y+theight, pig_width, pig_height);
// paint background for main box

1
src/gui/channellist.h
View File

@@ -99,6 +99,7 @@ private:
bool vlist; // "virtual" list, not bouquet
bool displayNext;
bool displayList;
bool pig_on_win;
int first_mode_found;
int ChannelList_Rec;