From fb0757b9132db40b4436215a0ecdb1537dc93907 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Wed, 30 Nov 2022 00:55:17 +0000 Subject: [PATCH] settings: Remove F_ALLOW_ARBITRARY_VALS from hotkey settings The hotkey settings come from a fixed enum, arbitrary values are not supported. It's not possible to use choice settings for them because some enum values are only used in the WPS, and some are only used in the tree. Change-Id: I4647a8c02d960234323a7f2bbf31fee9f8c5b91a --- apps/settings_list.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/settings_list.c b/apps/settings_list.c index 6815c64b57..8aa476a133 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -2103,13 +2103,13 @@ const struct settings_list settings[] = { #endif #ifdef HAVE_HOTKEY - TABLE_SETTING(F_ALLOW_ARBITRARY_VALS | F_CB_ON_SELECT_ONLY, hotkey_wps, + TABLE_SETTING(F_CB_ON_SELECT_ONLY, hotkey_wps, LANG_HOTKEY_WPS, HOTKEY_VIEW_PLAYLIST, "hotkey wps", "off,view playlist,show track info,pitchscreen,open with,delete,bookmark,plugin" ,UNIT_INT, hotkey_formatter, hotkey_getlang, hotkey_callback,8, HOTKEY_OFF, HOTKEY_VIEW_PLAYLIST, HOTKEY_SHOW_TRACK_INFO, HOTKEY_PITCHSCREEN, HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_BOOKMARK, HOTKEY_PLUGIN), - TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree, + TABLE_SETTING(0, hotkey_tree, LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree", #ifdef HAVE_TAGCACHE "off,properties,pictureflow,open with,delete,insert,insert shuffled",