diff --git a/data/cables.xml b/data/cables.xml
index debbe767f..4970d600c 100644
--- a/data/cables.xml
+++ b/data/cables.xml
@@ -220,11 +220,10 @@
-
-
-
-
-
+
+
+
+
@@ -245,32 +244,27 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
diff --git a/src/gui/components/cc_item_infobox.cpp b/src/gui/components/cc_item_infobox.cpp
index 4d3f785e9..a2a6b6cbb 100644
--- a/src/gui/components/cc_item_infobox.cpp
+++ b/src/gui/components/cc_item_infobox.cpp
@@ -105,8 +105,12 @@ void CComponentsInfoBox::paintPicture()
if (pic_name.empty())
return;
+ //NOTE: real values are reqiured, if we paint this item within a form as embedded cc-item
+ int x_pic = (cc_parent ? cc_xr : x) + fr_thickness;
+ int y_pic = (cc_parent ? cc_yr : y) + fr_thickness;
+
//init pic object and set icon paint position
- pic = new CComponentsPicture(x+fr_thickness+x_offset, y+fr_thickness, 0, min(48, height-2*fr_thickness), pic_name); //NOTE: icons do not scale!
+ pic = new CComponentsPicture(x_pic+x_offset, y_pic, 0, min(48, height-2*fr_thickness), pic_name); //NOTE: icons do not scale!
pic->setColorBody(col_body);
@@ -115,7 +119,7 @@ void CComponentsInfoBox::paintPicture()
pic->doPaintBg(false);
//fit icon into frame
- pic->setYPos(y+(height/2-pic->getHeight()/2));
+ pic->setYPos(y_pic+(height/2-pic->getHeight()/2));
//paint, but set visibility mode
pic->allowPaint(cc_allow_paint);
diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp
index 21a8643d1..203ccd5d1 100644
--- a/src/timerd/timermanager.cpp
+++ b/src/timerd/timermanager.cpp
@@ -1318,10 +1318,19 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id, evtlist);
time_t now = time(NULL);
+ time_t compare;
+
+ int pre, post;
+ CTimerManager::getInstance()->getRecordingSafety(pre, post);
+
CChannelEventList::iterator first = evtlist.end();
for (CChannelEventList::iterator e = evtlist.begin(); e != evtlist.end(); ++e)
{
- if (e->startTime < now)
+ compare = e->startTime;
+ if (!pre)
+ compare += e->duration;
+
+ if (compare <= now)
continue;
if (first == evtlist.end() || first->startTime > e->startTime)
first = e;
@@ -1335,8 +1344,6 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
time_t _alarmTime = first->startTime;
time_t _stopTime = first->startTime + first->duration;
if (recordingSafety) {
- int pre, post;
- CTimerManager::getInstance()->getRecordingSafety(pre, post);
_alarmTime -= pre;
_stopTime += post;
}