Patch from Lincoln to fix crashes on region trim.
git-svn-id: svn://localhost/ardour2/branches/3.0@5235 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
7a29763ba7
commit
8cd536ab85
|
@ -1518,12 +1518,8 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
|
|||
_editor->snap_to (_current_pointer_frame);
|
||||
}
|
||||
|
||||
if (_current_pointer_frame == _last_pointer_frame) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (first_move) {
|
||||
|
||||
|
||||
string trim_type;
|
||||
|
||||
switch (_operation) {
|
||||
|
@ -1560,6 +1556,10 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
|
|||
}
|
||||
}
|
||||
|
||||
if (_current_pointer_frame == _last_pointer_frame) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (left_direction) {
|
||||
frame_delta = (_last_pointer_frame - _current_pointer_frame);
|
||||
} else {
|
||||
|
|
|
@ -2412,12 +2412,12 @@ Editor::thaw_region_after_trim (RegionView& rv)
|
|||
}
|
||||
|
||||
region->thaw (_("trimmed region"));
|
||||
XMLNode &after = region->playlist()->get_state();
|
||||
session->add_command (new MementoCommand<Playlist>(*(region->playlist()), 0, &after));
|
||||
|
||||
AudioRegionView* arv = dynamic_cast<AudioRegionView*>(&rv);
|
||||
if (arv)
|
||||
|
||||
if (arv) {
|
||||
arv->unhide_envelope ();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Reference in New Issue