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/ardour_ui_dialogs.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/ardour_ui_dialogs.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 9db664199c..87a8dede29 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -51,6 +51,10 @@ ARDOUR_UI::set_session (Session *s) { SessionHandlePtr::set_session (s); + if (!_session) { + return; + } + if (location_ui) { location_ui->set_session(s); } @@ -65,10 +69,6 @@ ARDOUR_UI::set_session (Session *s) preroll_clock.set_session (s); postroll_clock.set_session (s); - if (!_session) { - return; - } - /* sensitize menu bar options that are now valid */ ActionManager::set_sensitive (ActionManager::session_sensitive_actions, true); |