From 7991e183c5d87871e94e4ea2fe5e17695b636c1f Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 28 Aug 2017 12:16:45 +0200 Subject: [PATCH] CComponentsHeader: add missing check for null pointer Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/5221769840ca6226aab20038e43af8afe8459ecb Author: Thilo Graf Date: 2017-08-28 (Mon, 28 Aug 2017) --- src/gui/components/cc_frm_header.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp index 2a8d82db8..0fcb8aa68 100644 --- a/src/gui/components/cc_frm_header.cpp +++ b/src/gui/components/cc_frm_header.cpp @@ -343,14 +343,18 @@ void CComponentsHeader::initLogo() * with previous or next item. */ if (cch_caption_align & CC_TITLE_LEFT){ - int left_tag = prev_item->getXPos() + prev_item->getWidth(); - if (x_logo <= left_tag) - x_logo = left_tag + logo_space/2 - w_logo/2; + if (prev_item){ + int left_tag = prev_item->getXPos() + prev_item->getWidth(); + if (x_logo <= left_tag) + x_logo = left_tag + logo_space/2 - w_logo/2; + } } if (cch_caption_align & CC_TITLE_RIGHT){ - if (x_logo + w_logo >= next_item->getXPos()) - x_logo = next_item->getXPos() - logo_space/2 - w_logo/2; + if (next_item){ + if (x_logo + w_logo >= next_item->getXPos()) + x_logo = next_item->getXPos() - logo_space/2 - w_logo/2; + } } }