diff options
author | William Wilgus <wilgus.william@gmail.com> | 2022-12-14 23:45:58 -0500 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2022-12-14 23:45:58 -0500 |
commit | 31759c9e53761eac75a33d6d702d43c76d942ae8 (patch) | |
tree | 8b6ed7f8c19c452208565c8e43ec1eea4e9089de /apps/settings_list.c | |
parent | 99839960a248624f69a1b6c09e8713d35628228a (diff) | |
download | rockbox-31759c9e53761eac75a33d6d702d43c76d942ae8.tar.gz rockbox-31759c9e53761eac75a33d6d702d43c76d942ae8.zip |
[Bug Fix] quickscreen clashed with WPS Hotkey browser
chris_s noted:
When you set the WPS hotkey as a QuickScreen item and shuffle through the options,
it eventually gets to the "Open Plugin" option and will show the File Browser,
clashing with the Viewports of the QuickScreen
Change-Id: I3addbbbac5842f89c000c155484d7cb934dc500e
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index a79429c469..4771306393 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -60,6 +60,7 @@ | |||
60 | #endif | 60 | #endif |
61 | #ifdef HAVE_HOTKEY | 61 | #ifdef HAVE_HOTKEY |
62 | #include "onplay.h" | 62 | #include "onplay.h" |
63 | #include "misc.h" /* current activity */ | ||
63 | #endif | 64 | #endif |
64 | 65 | ||
65 | #include "voice_thread.h" | 66 | #include "voice_thread.h" |
@@ -697,8 +698,11 @@ static void tsc_set_default(void* setting, void* defaultval) | |||
697 | #ifdef HAVE_HOTKEY | 698 | #ifdef HAVE_HOTKEY |
698 | static void hotkey_callback(int var) | 699 | static void hotkey_callback(int var) |
699 | { | 700 | { |
700 | if (get_hotkey_lang_id(var) == LANG_OPEN_PLUGIN) | 701 | if (get_current_activity() != ACTIVITY_QUICKSCREEN) |
701 | open_plugin_browse(ID2P(LANG_HOTKEY_WPS)); | 702 | { |
703 | if (get_hotkey_lang_id(var) == LANG_OPEN_PLUGIN) | ||
704 | open_plugin_browse(ID2P(LANG_HOTKEY_WPS)); | ||
705 | } | ||
702 | } | 706 | } |
703 | static const char* hotkey_formatter(char* buffer, size_t buffer_size, int value, | 707 | static const char* hotkey_formatter(char* buffer, size_t buffer_size, int value, |
704 | const char* unit) | 708 | const char* unit) |