From b7348bf4f5b36084b7f47c450db69919766e0ec0 Mon Sep 17 00:00:00 2001 From: nick_m Date: Fri, 22 May 2015 02:20:51 +1000 Subject: Fix excessive use of logic. --- gtk2_ardour/keyboard.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 72b9ff1ba4..e656ede9db 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -239,22 +239,20 @@ bool ArdourKeyboard::indicates_snap (guint state) { bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier()); - bool equals_s = Keyboard::modifier_state_equals (state, Keyboard::snap_modifier()); bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier()); bool equals_d = Keyboard::modifier_state_equals (state, Keyboard::snap_delta_modifier()); - return (equals_s || (contains_s && ((contains_d && !equals_d) || !contains_d))); + return (contains_s && ((contains_d && !equals_d) || !contains_d)); } bool ArdourKeyboard::indicates_snap_delta (guint state) { bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier()); - bool equals_d = Keyboard::modifier_state_equals (state, Keyboard::snap_delta_modifier()); bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier()); bool equals_s = Keyboard::modifier_state_equals (state, Keyboard::snap_modifier()); - return (equals_d || (contains_d && ((contains_s && !equals_s) || !contains_s))); + return (contains_d && ((contains_s && !equals_s) || !contains_s)); } void -- cgit v1.2.3