break out of step editing if a session goes away; do nothing in Editor::located(...

git-svn-id: svn://localhost/ardour2/branches/3.0@13229 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 5d92ccb08e63dd3259becad06297e1eefa461cd8..d07ac8794a83b141659a0ae3c325bbc77bb3c57e 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1178,6 +1178,8 @@ Editor::update_title ()
                WindowTitle title(session_name);
                title += Glib::get_application_name();
                set_title (title.get_string());
+       } else {
+               /* ::session_going_away() will have taken care of it */
        }
 }
 
@@ -3194,7 +3196,7 @@ Editor::new_tempo_section ()
 void
 Editor::map_transport_state ()
 {
-       ENSURE_GUI_THREAD (*this, &Editor::map_transport_state)
+       ENSURE_GUI_THREAD (*this, &Editor::map_transport_state);
 
        if (_session && _session->transport_stopped()) {
                have_pending_keyboard_selection = false;
@@ -4736,9 +4738,11 @@ Editor::located ()
 {
        ENSURE_GUI_THREAD (*this, &Editor::located);
 
-       playhead_cursor->set_position (_session->audible_frame ());
-       if (_follow_playhead && !_pending_initial_locate) {
-               reset_x_origin_to_follow_playhead ();
+       if (_session) {
+               playhead_cursor->set_position (_session->audible_frame ());
+               if (_follow_playhead && !_pending_initial_locate) {
+                       reset_x_origin_to_follow_playhead ();
+               }
        }
 
        _pending_locate_request = false;
@@ -5300,6 +5304,8 @@ Editor::session_going_away ()
        hide_measures ();
        clear_marker_display ();
 
+       stop_step_editing ();
+       
        current_bbt_points_begin = current_bbt_points_end;
 
        /* get rid of any existing editor mixer strip */