diff options
| author | Aidan MacDonald <amachronic@protonmail.com> | 2021-08-10 22:08:37 +0100 |
|---|---|---|
| committer | Aidan MacDonald <amachronic@protonmail.com> | 2021-08-10 22:48:26 +0100 |
| commit | b103b075034d74550bc77e8af4ba6f2b4e8a65df (patch) | |
| tree | 7a13d42ea9744881f3b132e2236106608078482a /apps | |
| parent | 69420e796c4008b8923b8241ab3e154442735678 (diff) | |
touchscreen: Fix annoying bug when switching touchscreen modes
Changing the touchscreen mode in the settings menu required a reboot
to fully apply because this code was trying to reapply old settings.
This is a hack. IMHO to fix it properly the behavior of touchscreen
mode needs to be changed so code that needs a specific mode doesn't
need to twiddle global state, but that's a bigger undertaking.
Change-Id: I55a46dbed721273ad78cb9df81fe60940665962b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/menu.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/menu.c b/apps/menu.c index 73cabea80a..c4f3024930 100644 --- a/apps/menu.c +++ b/apps/menu.c @@ -379,6 +379,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, #ifdef HAVE_TOUCHSCREEN /* plugins possibly have grid mode active. force global settings in lists */ enum touchscreen_mode tsm = touchscreen_get_mode(); + enum touchscreen_mode old_global_mode = global_settings.touch_mode; touchscreen_set_mode(global_settings.touch_mode); #endif @@ -740,7 +741,12 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, FOR_NB_SCREENS(i) viewportmanager_theme_undo(i, false); #ifdef HAVE_TOUCHSCREEN - touchscreen_set_mode(tsm); + /* This is needed because this function runs the settings menu and we do + * not want to switch back to the old mode if the user intentionally went + * to a different one. This is a very hacky way to do this... */ + if(!(global_settings.touch_mode != (int)old_global_mode && + tsm == old_global_mode)) + touchscreen_set_mode(tsm); #endif return ret; |