smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix programming error on removing marker.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7088 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-05-09 23:31:07 +00:00
parent 792e3de1d4
commit 8e76b4944c
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/editor_markers.cc
View file

@ -504,6 +504,8 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It
can_remove = mm->meter().movable (); can_remove = mm->meter().movable ();
} else if (tm) { } else if (tm) {
can_remove = tm->tempo().movable (); can_remove = tm->tempo().movable ();
} else {
return;
} }
delete tempo_or_meter_marker_menu; delete tempo_or_meter_marker_menu;
@ -994,12 +996,6 @@ Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) c
*m = dynamic_cast<MeterMarker*> (marker); *m = dynamic_cast<MeterMarker*> (marker);
*t = dynamic_cast<TempoMarker*> (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 void