From 55b6e84f5617427200f1e0a052dd7785e6e067b1 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Mon, 8 Apr 2019 17:18:38 +0200 Subject: [PATCH] Fix MIDI mapping setup of camera buttons/lights when clicking on them. Reported by Niall Walsh. --- futatabi/midi_mapping_dialog.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/futatabi/midi_mapping_dialog.cpp b/futatabi/midi_mapping_dialog.cpp index 67b33d3..6cd4b6e 100644 --- a/futatabi/midi_mapping_dialog.cpp +++ b/futatabi/midi_mapping_dialog.cpp @@ -490,16 +490,20 @@ void MIDIMappingDialog::controller_changed(unsigned controller) void MIDIMappingDialog::note_on(unsigned note) { post_to_main_thread([=]{ - for (const InstantiatedSpinner &is : button_spinners) { - if (is.spinner->hasFocus()) { - is.spinner->setValue(note); - is.spinner->selectAll(); + for (const auto &spinners : { button_spinners, camera_button_spinners }) { + for (const InstantiatedSpinner &is : spinners) { + if (is.spinner->hasFocus()) { + is.spinner->setValue(note); + is.spinner->selectAll(); + } } } - for (const InstantiatedSpinner &is : button_light_spinners) { - if (is.spinner->hasFocus()) { - is.spinner->setValue(note); - is.spinner->selectAll(); + for (const auto &light_spinners : { button_light_spinners, camera_button_light_spinners }) { + for (const InstantiatedSpinner &is : light_spinners) { + if (is.spinner->hasFocus()) { + is.spinner->setValue(note); + is.spinner->selectAll(); + } } } }); -- 2.39.2