fix computation of Text bounding box to respect _clamped_width

[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 24f6511b4cdd0f7bd8bba5cfeb91f595b9073730..db9e420206f0299fbbfe83d95f03f511bd00e0fc 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -161,10 +161,6 @@ ARDOUR_UI::set_session (Session *s)
        _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 ());
 
-#ifdef HAVE_JACK_SESSION
-       engine->JackSessionEvent.connect (*_session, MISSING_INVALIDATOR, boost::bind (&Session::jack_session_event, _session, _1), gui_context());
-#endif
-
        /* Clocks are on by default after we are connected to a session, so show that here.
        */
 
@@ -279,7 +275,10 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        rec_button.set_sensitive (false);
 
        WM::Manager::instance().set_session ((ARDOUR::Session*) 0);
-       ARDOUR_UI::instance()->video_timeline->close_session();
+
+       if (ARDOUR_UI::instance()->video_timeline) {
+               ARDOUR_UI::instance()->video_timeline->close_session();
+       }
 
        stop_blinking ();
        stop_clocking ();