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

Show default color of numbox and numboxtext when zapping over current channel in virtual zap, fix possible segfault

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1030 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e5e583b26a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-01-16 (Sun, 16 Jan 2011)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2011-01-16 17:51:06 +00:00
parent c0a3e0ca5b
commit 48feb4a164
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/infoviewer.cpp
View File

@@ -608,14 +608,15 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
} else
fadeValue = g_settings.infobar_alpha;
int col_NumBoxText;
int col_NumBox;
int col_NumBoxText = COL_INFOBAR;
int col_NumBox = COL_INFOBAR_PLUS_0;
ChannelName = Channel;
bool new_chan = false;
if (virtual_zap_mode) {
col_NumBoxText = COL_MENUHEAD;
col_NumBox = COL_MENUHEAD_PLUS_0;
if (g_RemoteControl->current_channel_id != new_channel_id) {
col_NumBoxText = COL_MENUHEAD;
}
if ((channel_id != new_channel_id) || (evtlist.empty())) {
evtlist.clear();
//evtlist = g_Sectionsd->getEventsServiceKey(new_channel_id & 0xFFFFFFFFFFFFULL);
@@ -624,9 +625,6 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
sort(evtlist.begin(),evtlist.end(), sortByDateTime);
new_chan = true;
}
} else {
col_NumBoxText = COL_INFOBAR;
col_NumBox = COL_INFOBAR_PLUS_0;
}
if (! calledFromNumZap && !(g_RemoteControl->subChannels.empty()) && (g_RemoteControl->selected_subchannel > 0))
{

2
src/gui/widget/menue.cpp
View File

@@ -535,7 +535,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
}
break;
case (CRCInput::RC_left):
if(!(items[selected]->can_arrow) || g_settings.menu_left_exit) {
if(( hasItem() && !(items[selected]->can_arrow)) || g_settings.menu_left_exit) {
msg = CRCInput::RC_timeout;
break;
}