From d1ddb37a906aeb6739f1db59fe2a64e7b5d3c21e Mon Sep 17 00:00:00 2001 From: martii Date: Tue, 12 Nov 2013 12:17:18 +0100 Subject: [PATCH] gui/widget/listframe: don't let m_nCurrentLine become < 0 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c6388a710662285781b625f1f81926ca195c0d2f Author: martii Date: 2013-11-12 (Tue, 12 Nov 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/listframe.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/widget/listframe.cpp b/src/gui/widget/listframe.cpp index 2a8effef1..6836e9af3 100644 --- a/src/gui/widget/listframe.cpp +++ b/src/gui/widget/listframe.cpp @@ -327,6 +327,8 @@ void CListFrame::onNewLineArray(void) if(m_nCurrentLine >= m_nNrOfLines) { m_nCurrentPage = m_nNrOfPages - 1; + if (m_nCurrentPage < 0) + m_nCurrentPage = 0; m_nCurrentLine = m_nCurrentPage * m_nLinesPerPage; } if(m_nSelectedLine >= m_nNrOfLines) @@ -652,10 +654,10 @@ bool CListFrame::setSelectedLine(int selection) { //TRACE("[CListFrame]->setSelectedLine %d \r\n",selection); bool result = false; + if (selection >= m_nNrOfLines) + selection = m_nNrOfLines - 1; if (selection < 0) selection = 0; - else if (selection >= m_nNrOfLines) - selection = m_nNrOfLines - 1; m_nSelectedLine = selection; m_nCurrentPage = selection / m_nLinesPerPage; m_nCurrentLine = m_nCurrentPage * m_nLinesPerPage;