From fb6f1e4d53b70eecc75ca14d7c0d8db33d1f2f3c Mon Sep 17 00:00:00 2001 From: nick black Date: Wed, 14 Oct 2020 07:54:25 -0400 Subject: [PATCH] ncmenu_unroll: don't unroll disabled sections --- src/lib/menu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/menu.c b/src/lib/menu.c index 386eaf38a..a58dbb5b6 100644 --- a/src/lib/menu.c +++ b/src/lib/menu.c @@ -351,12 +351,16 @@ section_width(const ncmenu* n, int sectionidx){ } int ncmenu_unroll(ncmenu* n, int sectionidx){ - if(sectionidx < 0 || sectionidx >= n->sectioncount){ + if(ncmenu_rollup(n)){ // roll up any unrolled section return -1; } - if(ncmenu_rollup(n)){ // roll up any unrolled section + if(sectionidx < 0 || sectionidx >= n->sectioncount){ + logerror(n->ncp->nc, "Unrolled invalid sectionidx %d\n", sectionidx); return -1; } + if(n->sections[sectionidx].enabled_item_count <= 0){ + return 0; + } if(n->sections[sectionidx].name == NULL){ return -1; }