From 7d6a79b6eddefd1afa7b1d5978dc72d89bf1ce6a Mon Sep 17 00:00:00 2001 From: GetAway Date: Tue, 4 Dec 2018 19:06:25 +0100 Subject: [PATCH] keybind_setup.cpp: fix menu special keys Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/b83c316907bb70193b0c62f4e58253dbb37b6cd6 Author: GetAway Date: 2018-12-04 (Tue, 04 Dec 2018) --- src/gui/keybind_setup.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index da47f46d8..0e86ddddc 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -547,10 +547,15 @@ void CKeybindSetup::showKeyBindMoviebrowserSetup(CMenuWidget *bindSettings_mbrow void CKeybindSetup::showKeyBindSpecialSetup(CMenuWidget *bindSettings_special) { bindSettings_special->addIntroItems(LOCALE_KEYBINDINGMENU_SPECIAL_ACTIVE); + int nkey; + if (g_info.hw_caps->has_button_vformat) + nkey = NKEY_FORMAT_MODE; + else + nkey = NKEY_PIC_MODE; - for (int i = NKEY_FORMAT_MODE; i <= NKEY_PIC_SIZE; i++) { - CMenuOptionChooser * mf = new CMenuOptionChooser(key_settings[i].keydescription, key_settings[i].keyvalue_p, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - mf->setHint("", key_settings[i].hint); + for (nkey; nkey <= NKEY_PIC_SIZE; nkey++) { + CMenuOptionChooser * mf = new CMenuOptionChooser(key_settings[nkey].keydescription, key_settings[nkey].keyvalue_p, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mf->setHint("", key_settings[nkey].hint); bindSettings_special->addItem(mf); } }