From 6ff6697eaddfdf643e9f2f04449b0f54b9b5cf07 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 11 Mar 2018 21:28:34 +0100 Subject: [PATCH] CComponentsHeader: avoid possible 'out of range' log message seen during left/right scroll with channellist Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/17a6df336ce312f0c7ffc0f839c4bb1e301d688e Author: Thilo Graf Date: 2018-03-11 (Sun, 11 Mar 2018) --- src/gui/components/cc_frm_header.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp index ebb2a9403..041345948 100644 --- a/src/gui/components/cc_frm_header.cpp +++ b/src/gui/components/cc_frm_header.cpp @@ -302,7 +302,7 @@ void CComponentsHeader::initLogo() */ int logo_id = getCCItemId(cch_logo_obj); CComponentsItem *prev_item = getCCItem((cch_caption_align & CC_TITLE_RIGHT) ? logo_id - 2 : logo_id - 1); - CComponentsItem *next_item = getCCItem((cch_caption_align & CC_TITLE_RIGHT) ? logo_id - 1 : logo_id + 1); + CComponentsItem *next_item = getCCItem((cch_caption_align & CC_TITLE_RIGHT) ? logo_id - 1 : min(logo_id + 1, (int)size()-1)); /* * FIXME: Workaround to fix next item in case of wrong order of items.