From 3cd712967fde1d5a68217944d83319bfbc564dc7 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 17 Jan 2020 18:42:54 +0100 Subject: [PATCH] cc_frm.cpp: Leave method 'getCCItem()' if item collection is empty. It makes no sense to execute these method if no items are existing and avoids unintended debug error output with "out of range" content. --- src/gui/components/cc_frm.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp index be6bb5c18..ed725e555 100644 --- a/src/gui/components/cc_frm.cpp +++ b/src/gui/components/cc_frm.cpp @@ -262,6 +262,9 @@ int CComponentsForm::genIndex() CComponentsItem* CComponentsForm::getCCItem(const uint& cc_item_id) const { + if (v_cc_items.empty()) + return NULL; + if (cc_item_id >= size()){ dprintf(DEBUG_NORMAL, "[CComponentsForm] [%s - %d] Error: inside container type = [%d] [%s] parameter cc_item_id = %u, out of range (size = %zx)...\n", __func__, __LINE__, cc_item_type.id, cc_item_type.name.c_str(), cc_item_id, size()); return NULL; @@ -269,6 +272,7 @@ CComponentsItem* CComponentsForm::getCCItem(const uint& cc_item_id) const if (v_cc_items.at(cc_item_id)) return v_cc_items.at(cc_item_id); + return NULL; }