From a71daf6a0645f50a46af764a2da6257f7f38e599 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Tue, 9 Jun 2009 08:41:43 +0000
Subject: [PATCH] Fix daft bugs causing crashes on dragging tempo markers.

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

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 52096e9cee..7aa4e3804b 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1749,7 +1749,7 @@ TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c)
 	: Drag (e, i),
 	  _copy (c)
 {
-	TempoMarker* _marker = reinterpret_cast<TempoMarker*> (_item->get_data ("marker"));
+	_marker = reinterpret_cast<TempoMarker*> (_item->get_data ("marker"));
 	assert (_marker);
 }
 
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index c67ca5942d..4c55403bf9 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -695,7 +695,7 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
 				return true;
 
 			case TempoMarkerItem:
-				assert (_drag);
+				assert (_drag == 0);
 				_drag = new TempoMarkerDrag (
 					this,
 					item,