Add browse button to recent session dialogue. Fixes #3357.

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index dad515671e559b7bc50a970b81ac1b4987f2373d..ae11b5bfbee0f2205361cc496be17e2671be2c88 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -504,7 +504,9 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It
                can_remove = mm->meter().movable ();
        } else if (tm) {
                can_remove = tm->tempo().movable ();
-       } 
+       } else {
+               return;
+       }
        
        delete tempo_or_meter_marker_menu;
        build_tempo_or_meter_marker_menu (can_remove);
@@ -994,12 +996,6 @@ Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) c
 
        *m = dynamic_cast<MeterMarker*> (marker);
        *t = dynamic_cast<TempoMarker*> (marker);
-
-       if (*m == 0 && *t == 0) {
-               fatal << X_("programming erorr: unhandled marker type in Editor::dynamic_cast_marker_object")
-                     << endmsg;
-               /*NOTREACHED*/
-       }
 }
 
 void
@@ -1119,7 +1115,7 @@ Editor::new_transport_marker_menu_popdown ()
        // hide rects
        transport_bar_drag_rect->hide();
 
-       _drags->break_drag ();
+       _drags->abort ();
 }
 
 void