From 1b87233ab5adc55a267a5ed6fd7864ff8f80a628 Mon Sep 17 00:00:00 2001 From: Pieter Hulshoff Date: Wed, 1 Feb 2017 23:35:26 +0100 Subject: [PATCH] Prevent RetroFE crash on page up/down on empty collection. --- RetroFE/Source/Graphics/Component/ScrollingList.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RetroFE/Source/Graphics/Component/ScrollingList.cpp b/RetroFE/Source/Graphics/Component/ScrollingList.cpp index bf16221..11c6dc9 100644 --- a/RetroFE/Source/Graphics/Component/ScrollingList.cpp +++ b/RetroFE/Source/Graphics/Component/ScrollingList.cpp @@ -261,6 +261,9 @@ void ScrollingList::letterDown() void ScrollingList::letterChange(bool increment) { + + if(!items_ || items_->size() == 0) return; + std::string startname = items_->at((itemIndex_+selectedOffsetIndex_)%items_->size())->lowercaseFullTitle(); for(unsigned int i = 0; i < items_->size(); ++i) @@ -641,10 +644,7 @@ void ScrollingList::updateScrollPeriod() void ScrollingList::scroll(bool forward) { - if(items_->size() == 0) - { - return; - } + if(!items_ || items_->size() == 0) return; if(forward) {