From c6549789431e95a63a08e035737cfd222d603eec Mon Sep 17 00:00:00 2001 From: Grygorii Zharun Date: Tue, 3 Jun 2014 06:11:32 -0500 Subject: [PATCH] [Summary] Fixed windows version of tracks [Details] The fault was: Set on/off button pointer to 0 in midi device control and used this ptr after that. [git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 465353] --- gtk2_ardour/midi_device_connection_control.cc | 4 ---- gtk2_ardour/tracks_control_panel.logic.cc | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/gtk2_ardour/midi_device_connection_control.cc b/gtk2_ardour/midi_device_connection_control.cc index 3e2c3f666e..6ad3e8b2e1 100644 --- a/gtk2_ardour/midi_device_connection_control.cc +++ b/gtk2_ardour/midi_device_connection_control.cc @@ -45,8 +45,6 @@ MidiDeviceConnectionControl::MidiDeviceConnectionControl (const std::string& mid if (!has_capture) { _capture_on_button->hide(); _capture_off_button->hide(); - _capture_on_button = NULL; - _capture_off_button = NULL; } _playback_on_button = &_children.get_waves_button ("playback_on_button"); @@ -55,8 +53,6 @@ MidiDeviceConnectionControl::MidiDeviceConnectionControl (const std::string& mid if (!has_playback) { _playback_on_button->hide(); _playback_off_button->hide(); - _playback_on_button = NULL; - _playback_off_button = NULL; } _name_label = &_children.get_label ("midi_device_name_label"); diff --git a/gtk2_ardour/tracks_control_panel.logic.cc b/gtk2_ardour/tracks_control_panel.logic.cc index 7b7cde3532..721d186633 100644 --- a/gtk2_ardour/tracks_control_panel.logic.cc +++ b/gtk2_ardour/tracks_control_panel.logic.cc @@ -516,7 +516,7 @@ TracksControlPanel::cleanup_midi_device_list() if (control) { control->remove_data(MidiDeviceConnectionControl::capture_id_name); - control->remove_data(MidiDeviceConnectionControl::capture_id_name); + control->remove_data(MidiDeviceConnectionControl::playback_id_name); } midi_device_controls.pop_back();