diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 23:36:52 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 23:36:52 +0000 |
| commit | 67460c2af45d0455e64623572480c064445c2e5b (patch) | |
| tree | 90b001525f712a1523ae853e9d37660634c89a17 /gtk2_ardour/editor.cc | |
| parent | cbb272af44b6a3e3cb807d70a46b5f6d0d7ed109 (diff) | |
fix deadlock in protocol manager startup; fix some other ::set_session() SNAFUs; remove last boost::signals2::connection member from libardour
git-svn-id: svn://localhost/ardour2/branches/3.0@6375 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index bf0b2124bb..7cc9e26339 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -436,8 +436,8 @@ Editor::Editor () transport_mark_label.set_no_show_all(); initialize_rulers (); - _summary = new EditorSummary (this); initialize_canvas (); + _summary = new EditorSummary (this); selection->TimeChanged.connect (sigc::mem_fun(*this, &Editor::time_selection_changed)); selection->TracksChanged.connect (sigc::mem_fun(*this, &Editor::track_selection_changed)); @@ -1033,6 +1033,10 @@ Editor::set_session (Session *t) { SessionHandlePtr::set_session (t); + if (!_session) { + return; + } + zoom_range_clock.set_session (_session); _playlist_selector->set_session (_session); nudge_clock.set_session (_session); @@ -1056,10 +1060,6 @@ Editor::set_session (Session *t) sfbrowser->set_session (_session); } - if (!_session) { - return; - } - compute_fixed_ruler_scale (); /* there are never any selected regions at startup */ |