diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/action.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/apps/action.c b/apps/action.c index 15422f987b..5533c00241 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -683,6 +683,20 @@ static inline int do_auto_softlock(action_last_t *last, action_cur_t *cur) | |||
683 | if (is_timeout) | 683 | if (is_timeout) |
684 | { | 684 | { |
685 | do_key_lock(true); | 685 | do_key_lock(true); |
686 | |||
687 | #if defined(HAVE_TOUCHPAD) | ||
688 | /* if the touchpad is supposed to be off and the current buttonpress | ||
689 | * is from the touchpad, nullify both button and action. */ | ||
690 | if (!has_flag(action_last.softlock_mask, SEL_ACTION_ENABLED) || | ||
691 | has_flag(action_last.softlock_mask, SEL_ACTION_NOTOUCH)) | ||
692 | { | ||
693 | cur->button = touchpad_filter(cur->button); | ||
694 | if (cur->button == BUTTON_NONE) | ||
695 | { | ||
696 | action = ACTION_NONE; | ||
697 | } | ||
698 | } | ||
699 | #endif | ||
686 | } | 700 | } |
687 | else if (action == ACTION_STD_KEYLOCK) | 701 | else if (action == ACTION_STD_KEYLOCK) |
688 | { | 702 | { |