don't bother doing port stuff if session is being deleted

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index a83d30cb7b6352572f6060bbc9f503b1e4b6de6e..c6a75015b52863f7d573000aff338a6d05924983 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -23,8 +23,8 @@
 
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/window_title.h>
 
+#include "ardour/session.h"
 #include "ardour/location.h"
 #include "ardour/profile.h"
 #include "pbd/memento_command.h"
@@ -828,7 +828,9 @@ Editor::marker_menu_range_to_next ()
                return;
        }
 
-       nframes_t end = session->locations()->first_mark_after (marker->position());
+       nframes64_t start;
+       nframes64_t end;
+       session->locations()->marks_either_side (marker->position(), start, end);
 
        if (end != max_frames) {
                string range_name = l->name();
@@ -1047,15 +1049,12 @@ Editor::marker_menu_rename ()
 
        dialog.set_prompt (_("New Name:"));
 
-       WindowTitle title(Glib::get_application_name());
        if (loc->is_mark()) {
-               title += _("Rename Mark");
+               dialog.set_title (_("Rename Mark"));
        } else {
-               title += _("Rename Range");
+               dialog.set_title (_("Rename Range"));
        }
 
-       dialog.set_title(title.get_string());
-
        dialog.set_name ("MarkRenameWindow");
        dialog.set_size_request (250, -1);
        dialog.set_position (Gtk::WIN_POS_MOUSE);
@@ -1178,34 +1177,10 @@ Editor::marker_selection_changed ()
                }
        }
 
-       edit_point_clock_connection_a.disconnect();
-       edit_point_clock_connection_b.disconnect();
-
-       if (selection->markers.empty()) {
-               edit_point_clock.set (0);
-               return;
-       }
-
        for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
                (*x)->add_line (cursor_group, 0, _canvas_height);
                (*x)->show_line ();
        }
-
-       edit_point_clock.set (selection->markers.front()->position());
-
-       bool ignored;
-       Location* loc = find_location_from_marker (selection->markers.front(), ignored);
-
-       if (loc) {
-               edit_point_clock_connection_a = loc->changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
-               edit_point_clock_connection_b = loc->start_changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
-       }
-}
-
-void
-Editor::selected_marker_moved (Location* loc)
-{
-       edit_point_clock.set (loc->start());
 }
 
 struct SortLocationsByPosition {