diff options
| author | David Robillard <d@drobilla.net> | 2008-09-14 18:12:37 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-09-14 18:12:37 +0000 |
| commit | b69410425c1070aad5aa8a711a9ebb671f308621 (patch) | |
| tree | 568b079dadfccec78fe7da41c16b09f4805c246a | |
| parent | 5befe852184c09175ce62f2df3b017b03c6999ef (diff) | |
Fix deleting of MIDI regions.
git-svn-id: svn://localhost/ardour2/branches/3.0@3725 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rwxr-xr-x | gtk2_ardour/ardbg | 2 | ||||
| -rw-r--r-- | gtk2_ardour/audio_streamview.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/midi_streamview.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/ardbg b/gtk2_ardour/ardbg index cdb640d63e..e7f73c3636 100755 --- a/gtk2_ardour/ardbg +++ b/gtk2_ardour/ardbg @@ -3,4 +3,4 @@ dir=`dirname "$0"` . $dir/ardev_common.sh LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH export ARDOUR_INSIDE_GDB=1 -exec gdb $EXECUTABLE "$@" +exec gdb --args $EXECUTABLE "$@" diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 7ab0a07f6f..53e182c8d6 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -439,7 +439,6 @@ AudioStreamView::redisplay_diskstream () } i = tmp; - } for (xi = crossfade_views.begin(); xi != crossfade_views.end();) { diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 8c25805984..d53150fd91 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -214,6 +214,8 @@ MidiStreamView::redisplay_diskstream () if (!(*i)->is_valid()) { delete *i; region_views.erase (i); + i = tmp; + continue; } else { (*i)->enable_display(true); (*i)->set_y_position_and_height(0, height); // apply note range |