From 8cd536ab85b5923fe97d32cb93c913420fbaf5bf Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Sun, 21 Jun 2009 18:34:08 +0000
Subject: [PATCH] Patch from Lincoln to fix crashes on region trim.

git-svn-id: svn://localhost/ardour2/branches/3.0@5235 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/editor_drag.cc  | 10 +++++-----
 gtk2_ardour/editor_mouse.cc |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index f094290136..982f003c88 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -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 {
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index bbc21c358e..e9705f5e02 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -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