Fix programming error on removing marker.

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

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 0b3874b441b3276b8b32200929731d3eedb631d2..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