Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2017-03-04 19:32:30 +01:00
46 changed files with 335 additions and 233 deletions

View File

@@ -165,9 +165,6 @@ void CComponentsScrollBar::initSegments()
y_seg += h_seg + append_y_offset;
int id = sb_segments_obj->getCCItemId(item);
if (sb_mark_id > id){
dprintf(DEBUG_NORMAL, "[CComponentsScrollBar] %s: sb_mark_id out of range current=%d allowed=%d\n", __func__, sb_mark_id, id);
}
//set color for marked id
if (sb_mark_id == id){