diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-05-09 23:31:07 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-05-09 23:31:07 +0000 |
| commit | 8e76b4944ce6bc079cd787417f7d6a36a26314db (patch) | |
| tree | 4278e89ee458f4e57a40bbc493e7410cd9abc61c /gtk2_ardour/editor_markers.cc | |
| parent | 792e3de1d4cb291a02c5c31dad54028049bafed9 (diff) | |
Fix programming error on removing marker.
git-svn-id: svn://localhost/ardour2/branches/3.0@7088 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 0b3874b441..ae11b5bfbe 100644 --- 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 |