From 31759c9e53761eac75a33d6d702d43c76d942ae8 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Wed, 14 Dec 2022 23:45:58 -0500 Subject: [PATCH] [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 --- apps/settings_list.c | 8 ++++++-- 1 file 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 @@ #endif #ifdef HAVE_HOTKEY #include "onplay.h" +#include "misc.h" /* current activity */ #endif #include "voice_thread.h" @@ -697,8 +698,11 @@ static void tsc_set_default(void* setting, void* defaultval) #ifdef HAVE_HOTKEY static void hotkey_callback(int var) { - if (get_hotkey_lang_id(var) == LANG_OPEN_PLUGIN) - open_plugin_browse(ID2P(LANG_HOTKEY_WPS)); + if (get_current_activity() != ACTIVITY_QUICKSCREEN) + { + if (get_hotkey_lang_id(var) == LANG_OPEN_PLUGIN) + open_plugin_browse(ID2P(LANG_HOTKEY_WPS)); + } } static const char* hotkey_formatter(char* buffer, size_t buffer_size, int value, const char* unit)