From 48889d36f08aa3033256b7b7c8be03b756e98d17 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 18 Jul 2017 14:10:29 -0400
Subject: [PATCH] Precaution in case a certain assertion fails (I haven't
 observed it)

---
 src/tracks/ui/SelectHandle.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/tracks/ui/SelectHandle.cpp b/src/tracks/ui/SelectHandle.cpp
index e6979808c..a7836f6b7 100644
--- a/src/tracks/ui/SelectHandle.cpp
+++ b/src/tracks/ui/SelectHandle.cpp
@@ -383,7 +383,12 @@ UIHandlePtr SelectHandle::HitTest
    bool oldUseSnap = true;
    if (old) {
       // It should not have started listening to timer events
-      wxASSERT( !old->mTimerHandler );
+      if( old->mTimerHandler ) {
+         wxASSERT(false);
+         // Handle this eventuality anyway, don't leave a dangling back-pointer
+         // in the attached event handler.
+         old->mTimerHandler.reset();
+      }
       oldUseSnap = old->mUseSnap;
    }