From 4ac45a55fb249e3312e53aa240c3b85f7a1c059d Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 14 May 2020 09:17:41 +0200
Subject: [PATCH] Choice fixes

---
 radio/src/thirdparty/libopenui/src/choice.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/choice.h b/radio/src/thirdparty/libopenui/src/choice.h
index 14da958d6..3d3db203a 100644
--- a/radio/src/thirdparty/libopenui/src/choice.h
+++ b/radio/src/thirdparty/libopenui/src/choice.h
@@ -113,12 +113,13 @@ class Choice : public ChoiceBase {
         while (value < vmax && !isValueAvailable(value)) {
           value++;
         }
+        value++;
         index--;
       }
       return value;
     }
 
-    int getValuesCount()
+    unsigned getValuesCount()
     {
       return getIndexFromValue(vmax + 1);
     }
@@ -128,7 +129,7 @@ class Choice : public ChoiceBase {
       textHandler = std::move(handler);
     }
 
-    void setMenuTitle(const std::string value)
+    void setMenuTitle(std::string value)
     {
       menuTitle = std::move(value);
     }