diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
| commit | 7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch) | |
| tree | 25e1b01865e76193f3c88483d4f9de1c8abf2f9d /gtk2_ardour/editor.cc | |
| parent | e6521bb0434d88802aa28e75235bc8c19ebb9262 (diff) | |
| parent | f5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff) | |
fix merge conflicts with master
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 7af556416d..c140ef71ab 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1260,7 +1260,8 @@ Editor::set_session (Session *t) /* These signals can all be emitted by a non-GUI thread. Therefore the handlers for them must not attempt to directly interact with the GUI, - but use Gtkmm2ext::UI::instance()->call_slot(); + but use PBD::Signal<T>::connect() which accepts an event loop + ("context") where the handler will be asked to run. */ _session->StepEditStatusChange.connect (_session_connections, invalidator (*this), boost::bind (&Editor::step_edit_status_change, this, _1), gui_context()); |