From 05f1a03cb4e9159f46ef079f8c2e21592b517f67 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 7 Jun 2017 12:21:33 -0400
Subject: [PATCH] Do not HandleInterruptedDrag for ESC key, it would be
 redundant

---
 src/TrackPanel.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 5cc1b7721..8833165ee 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -6186,7 +6186,9 @@ void TrackPanel::HandleWheelRotationInVRuler
 /// Filter captured keys typed into LabelTracks.
 void TrackPanel::OnCaptureKey(wxCommandEvent & event)
 {
-   HandleInterruptedDrag();
+   wxKeyEvent *kevent = static_cast<wxKeyEvent *>(event.GetEventObject());
+   if ( WXK_ESCAPE != kevent->GetKeyCode() )
+      HandleInterruptedDrag();
 
    // Only deal with LabelTracks
    Track *t = GetFocusedTrack();
@@ -6194,7 +6196,6 @@ void TrackPanel::OnCaptureKey(wxCommandEvent & event)
       event.Skip();
       return;
    }
-   wxKeyEvent *kevent = (wxKeyEvent *)event.GetEventObject();
 
    event.Skip(!((LabelTrack *)t)->CaptureKey(*kevent));
 }