Fix MIDI mapping setup of camera buttons/lights when clicking on them.

Reported by Niall Walsh.

diff --git a/futatabi/midi_mapping_dialog.cpp b/futatabi/midi_mapping_dialog.cpp
index 67b33d3c1eb37b9f314ce801db91e69ec3efd0d1..6cd4b6e8e7441ae0cf3539c0cd9133f492251015 100644 (file)
--- 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();
+                               }
                        }
                }
        });