smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Hot fix of segmentation fault

Browse source 
[Review] GZharun
This commit is contained in:
nikolay 2014-06-25 16:19:10 +03:00
parent 1ed079e37f
commit 8cb40255c3
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/ardour_ui.cc
View file

@ -3174,12 +3174,6 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
msg.run ();
return -1;
}
_session->config.ParameterChanged.connect_same_thread (connection_with_session_config, boost::bind (&ARDOUR_UI::on_parameter_changed, this, _1));
new_session->config.set_native_file_header_format(this->_header_format);
new_session->config.set_native_file_data_format (this->_sample_format);
new_session->config.set_timecode_format(this->_timecode_format);
/* Give the new session the default GUI state, if such things exist */

10
gtk2_ardour/ardour_ui_dialogs.cc
View file

@ -164,8 +164,9 @@ ARDOUR_UI::set_session (Session *s)
_session->locations()->added.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context());
_session->locations()->removed.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context());
_session->config.ParameterChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_parameter_changed, this, _1), gui_context ());
/* Clocks are on by default after we are connected to a session, so show that here.
_session->config.ParameterChanged.connect_same_thread (connection_with_session_config, boost::bind (&ARDOUR_UI::on_parameter_changed, this, _1));
/* Clocks are on by default after we are connected to a session, so show that here.
*/
connect_dependents_to_session (s);
@ -188,8 +189,9 @@ ARDOUR_UI::set_session (Session *s)
point_one_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_one_seconds), 100);
point_zero_something_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_zero_something_seconds), 40);
update_format ();
update_timecode_format();
_session->config.set_native_file_header_format(this->_header_format);
_session->config.set_native_file_data_format (this->_sample_format);
_session->config.set_timecode_format(this->_timecode_format);
if (meter_box.get_parent()) {
transport_tearoff_hbox.remove (meter_box);