remove GTKOSX_PREFIX from scons; MIDI/MMC fix from Chris G; fix crash when starting...

[ardour.git] / gtk2_ardour / option_editor.cc

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 2ef7c43d4f9060cea5ea61ea0af89a8d2a8b2b8d..dec3402e2f4575f2cf5e69c75f885ff01465d8ce 100644 (file)
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -378,7 +378,9 @@ OptionEditor::setup_midi_options ()
        label = (manage (new Label (_("Inbound MMC Device ID")))); 
        hbox->pack_start (mmc_receive_device_id_spinner, false, false);
        hbox->pack_start (*label, false, false);
-       midi_packer.pack_start (*hbox, false, false);
+       midi_packer.pack_start (*hbox, false, false); 
+
+       mmc_receive_device_id_spinner.set_value(Config->get_mmc_receive_device_id ());
 
        hbox = manage (new HBox);
        hbox->set_border_width (6);
@@ -388,6 +390,8 @@ OptionEditor::setup_midi_options ()
        hbox->pack_start (*label, false, false);
        midi_packer.pack_start (*hbox, false, false);
 
+       mmc_send_device_id_spinner.set_value(Config->get_mmc_send_device_id ());
+
        add_midi_port_button.signal_clicked().connect (mem_fun (*this, &OptionEditor::add_midi_port));
 }