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

Merge branch 'master' into pu/msgbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b9d2542e6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-10-28 08:05:34 +02:00
parent 32ff66c98b 56ba19313d
commit 045ac300c7
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_item_picture.cpp
View File

@@ -225,7 +225,7 @@ void CComponentsPicture::initCCItem()
width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness; width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
#endif #endif
} }
if (keep_dy_aspect & dx){ if (keep_dy_aspect && dx){
float w_ratio = float(width)*100/(float)dx; float w_ratio = float(width)*100/(float)dx;
height = int(w_ratio*(float)dy/100); height = int(w_ratio*(float)dy/100);
} }

2
src/gui/eventlist.cpp
View File

@@ -481,7 +481,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
t_channel_id used_id = IS_WEBTV(channel_id) ? channel_id : evtlist[selected].channelID; t_channel_id used_id = IS_WEBTV(channel_id) ? channel_id : evtlist[selected].channelID;
if (!recDir.empty() && doRecord) //add/remove recording timer events and check/warn for conflicts if (!recDir.empty() && doRecord) //add/remove recording timer events and check/warn for conflicts
{ {
CFollowScreenings m(channel_id, CFollowScreenings m(used_id,
evtlist[selected].startTime, evtlist[selected].startTime,
evtlist[selected].startTime + evtlist[selected].duration, evtlist[selected].startTime + evtlist[selected].duration,
evtlist[selected].description, evtlist[selected].eventID, TIMERD_APIDS_CONF, true, "", &evtlist); evtlist[selected].description, evtlist[selected].eventID, TIMERD_APIDS_CONF, true, "", &evtlist);

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

@@ -891,9 +891,11 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
pos -= dir * items.size(); pos -= dir * items.size();
wrap = true; wrap = true;
} }
if (pos >= (int)items.size()) if (!items.empty() && pos >= (int)items.size())
pos = (int)items.size() - 1; pos = (int)items.size() - 1;
do { do {
if(items.empty())
break;
CMenuItem* item = items[pos]; CMenuItem* item = items[pos];
if (item->isSelectable()) { if (item->isSelectable()) {
if (pos < page_start[current_page + 1] && pos >= page_start[current_page]) { if (pos < page_start[current_page + 1] && pos >= page_start[current_page]) {