summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Loftis <ben@harrisonconsoles.com>2016-01-31 22:28:13 -0600
committerBen Loftis <ben@harrisonconsoles.com>2016-01-31 22:28:13 -0600
commitc69514afe95531a09e1eb9f6e14af9c5a6b57950 (patch)
treee27dccbfc879b1c5e0f8c4a09ead18e319b16c69
parent8821569f4a69665995849bc88faf95a32bf5730e (diff)
Mackie protocol: clear Marker modifer
-rw-r--r--libs/surfaces/mackie/mcp_buttons.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index b24a53f537..c1cd673931 100644
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -426,6 +426,8 @@ MackieControlProtocol::marker_press (Button &)
LedState
MackieControlProtocol::marker_release (Button &)
{
+ _modifier_state &= ~MODIFIER_MARKER;
+
if (marker_modifier_consumed_by_button) {
/* marker was used a modifier for some other button(s), so do
nothing
@@ -435,8 +437,6 @@ MackieControlProtocol::marker_release (Button &)
string markername;
- _modifier_state &= ~MODIFIER_MARKER;
-
/* Don't add another mark if one exists within 1/100th of a second of
* the current position and we're not rolling.
*/