From 453a594264389f01b973a10793624fdb8909709d Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Sat, 1 Jul 2006 22:49:09 +0000
Subject: [PATCH] Fixed audio dragging bugs related to scrub bar

Originally committed to SVN as r456.
---
 core/audio_display.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/audio_display.cpp b/core/audio_display.cpp
index 229c459e7..203899326 100644
--- a/core/audio_display.cpp
+++ b/core/audio_display.cpp
@@ -1268,7 +1268,7 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event) {
 	}
 
 	// Scale dragging
-	if (onScale || draggingScale) {
+	if ((hold == 0 && onScale) || draggingScale) {
 		if (event.ButtonDown(wxMOUSE_BTN_LEFT)) {
 			lastDragX = x;
 			draggingScale = true;
@@ -1279,12 +1279,14 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event) {
 			UpdatePosition(Position + delta);
 			UpdateImage();
 			Refresh(false);
+			SetCursor(wxNullCursor);
+			return;
 		}
 		else draggingScale = false;
 	}
 
 	// Outside
-	if (!inside) return;
+	if (!inside && hold == 0) return;
 
 	// Left/middle click
 	if (event.ButtonDown(wxMOUSE_BTN_LEFT) || event.Button(wxMOUSE_BTN_MIDDLE)) {