From 63f987506629dc6a6bbd7a2e962c71032f960c1d Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sat, 2 Jul 2016 11:11:41 -0400
Subject: [PATCH] Make previous fix safer

---
 src/toolbars/ToolBar.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/toolbars/ToolBar.cpp b/src/toolbars/ToolBar.cpp
index 6c27b7514..073d6049e 100644
--- a/src/toolbars/ToolBar.cpp
+++ b/src/toolbars/ToolBar.cpp
@@ -78,6 +78,7 @@ private:
    void OnLeftDown(wxMouseEvent & event);
    void OnLeftUp(wxMouseEvent & event);
    void OnEnter(wxMouseEvent & event);
+   void OnLeave(wxMouseEvent & event);
    void OnMotion(wxMouseEvent & event);
    void ResizeBar(const wxSize &size);
    void OnCaptureLost(wxMouseCaptureLostEvent & event);
@@ -101,6 +102,7 @@ BEGIN_EVENT_TABLE( ToolBarResizer, wxWindow )
    EVT_LEFT_DOWN( ToolBarResizer::OnLeftDown )
    EVT_LEFT_UP( ToolBarResizer::OnLeftUp )
    EVT_ENTER_WINDOW( ToolBarResizer::OnEnter )
+   EVT_LEAVE_WINDOW( ToolBarResizer::OnLeave )
    EVT_MOTION( ToolBarResizer::OnMotion )
    EVT_MOUSE_CAPTURE_LOST( ToolBarResizer::OnCaptureLost )
    EVT_KEY_DOWN( ToolBarResizer::OnKeyDown )
@@ -193,6 +195,11 @@ void ToolBarResizer::OnEnter( wxMouseEvent & event )
       mOrigFocus = FindFocus();
 }
 
+void ToolBarResizer::OnLeave( wxMouseEvent & event )
+{
+   mOrigFocus = nullptr;
+}
+
 void ToolBarResizer::OnMotion( wxMouseEvent & event )
 {
    // Go ahead and set the event to propagate