From 23041fda88284c35a926ab0c8baa6ea53dccedef Mon Sep 17 00:00:00 2001 From: Len Ovens Date: Sat, 16 Jan 2016 11:17:52 -0800 Subject: [PATCH] Mackie Control: fix math error that tried to change bank to very high number --- libs/surfaces/mackie/mackie_control_protocol.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 97f96157d0..2580fa9672 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1301,7 +1301,11 @@ MackieControlProtocol::notify_remote_id_changed() if (sorted.size() - _current_initial_bank < sz) { // but don't shift backwards past the zeroth channel - switch_banks (max((Sorted::size_type) 0, sorted.size() - sz)); + if (sorted.size() < sz) { // avoid unsigned math mistake below + switch_banks(0, true); + } else { + switch_banks (max((Sorted::size_type) 0, sorted.size() - sz), true); + } } else { // Otherwise just refresh the current bank refresh_current_bank();