start tweaks to make Shift sticky; remove Shift-press combobox from gui since we don't allow that to be bound (next-marker)

1 files changed, 10 insertions, 4 deletions

diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc
index b0effd2227..9227da1ab3 100644
--- a/libs/surfaces/faderport/faderport.cc
+++ b/libs/surfaces/faderport/faderport.cc
@@ -308,18 +308,20 @@ FaderPort::button_handler (MIDI::Parser &, MIDI::EventTwoBytes* tb)
 		button.timeout_connection.disconnect ();
 	}
 
+	ButtonState bs (ButtonState (0));
+
 	switch (id) {
 	case Shift:
-		button_state = (tb->value ? ButtonState (button_state|ShiftDown) : ButtonState (button_state&~ShiftDown));
+		bs = ShiftDown;
 		break;
 	case Stop:
-		button_state = (tb->value ? ButtonState (button_state|StopDown) : ButtonState (button_state&~StopDown));
+		bs = StopDown;
 		break;
 	case Rewind:
-		button_state = (tb->value ? ButtonState (button_state|RewindDown) : ButtonState (button_state&~RewindDown));
+		bs = RewindDown;
 		break;
 	case User:
-		button_state = (tb->value ? ButtonState (button_state|UserDown) : ButtonState (button_state&~UserDown));
+		bs = UserDown;
 		break;
 	case FaderTouch:
 		fader_is_touched = tb->value;
@@ -342,6 +344,10 @@ FaderPort::button_handler (MIDI::Parser &, MIDI::EventTwoBytes* tb)
 		break;
 	}
 
+	if (bs) {
+		button_state = (tb->value ? ButtonState (button_state|bs) : ButtonState (button_state&~bs));
+	}
+
 	if (button.uses_flash()) {
 		button.set_led_state (_output_port, (int)tb->value);
 	}