diff --git a/core/MenuStyle_Base.cpp b/core/MenuStyle_Base.cpp index f372c92f..fde1a1fe 100644 --- a/core/MenuStyle_Base.cpp +++ b/core/MenuStyle_Base.cpp @@ -548,7 +548,7 @@ unsigned int CBaseMenu::GetItemCount() bool CBaseMenu::SetPagination(unsigned int itemsPerPage) { - if (itemsPerPage > 7) + if (itemsPerPage > 7 || itemsPerPage == 1) { return false; } diff --git a/core/MenuStyle_Radio.cpp b/core/MenuStyle_Radio.cpp index 989e350c..fc558799 100644 --- a/core/MenuStyle_Radio.cpp +++ b/core/MenuStyle_Radio.cpp @@ -322,6 +322,7 @@ void CRadioDisplay::DeleteThis() bool CRadioDisplay::SetSelectableKeys(unsigned int keymap) { keys = (signed)keymap; + return true; } CRadioMenu::CRadioMenu(IMenuHandler *pHandler, IdentityToken_t *pOwner) : diff --git a/core/MenuStyle_Valve.cpp b/core/MenuStyle_Valve.cpp index 819b7e1e..aff9f228 100644 --- a/core/MenuStyle_Valve.cpp +++ b/core/MenuStyle_Valve.cpp @@ -325,14 +325,12 @@ void CValveMenu::Cancel_Finally() bool CValveMenu::SetPagination(unsigned int itemsPerPage) { - if (itemsPerPage < 1 || itemsPerPage > 5) + if (itemsPerPage > 5) { return false; } - CBaseMenu::SetPagination(itemsPerPage); - - return true; + return CBaseMenu::SetPagination(itemsPerPage); } bool CValveMenu::SetExtOption(MenuOption option, const void *valuePtr)