From dc864f3782ce90a8a45d5c4e3524132c7212329a Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sun, 9 Jul 2017 12:31:19 -0400
Subject: [PATCH] Fix windows build, and simplify a little

---
 src/tracks/ui/TimeShiftHandle.cpp | 9 +--------
 src/tracks/ui/TimeShiftHandle.h   | 4 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp
index 0c62d4481..89f941e02 100644
--- a/src/tracks/ui/TimeShiftHandle.cpp
+++ b/src/tracks/ui/TimeShiftHandle.cpp
@@ -469,7 +469,7 @@ UIHandle::Result TimeShiftHandle::Click
    mRect = rect;
    mMouseClickX = event.m_x;
    const double selStart = viewInfo.PositionToTime(event.m_x, mRect.x);
-   mSnapManager = std::make_unique<SnapManager>(trackList,
+   mSnapManager = std::make_shared<SnapManager>(trackList,
                                   &viewInfo,
                                   &mClipMoveState.capturedClipArray,
                                   &mClipMoveState.trackExclusions,
@@ -783,10 +783,6 @@ UIHandle::Result TimeShiftHandle::Release
 
    Result result = RefreshNone;
 
-   mCapturedTrack.reset();
-   mSnapManager.reset(NULL);
-   mClipMoveState.capturedClipArray.clear();
-
    // Do not draw yellow lines
    if ( mClipMoveState.snapLeft != -1 || mClipMoveState.snapRight != -1) {
       mClipMoveState.snapLeft = mClipMoveState.snapRight = -1;
@@ -842,9 +838,6 @@ UIHandle::Result TimeShiftHandle::Release
 UIHandle::Result TimeShiftHandle::Cancel(AudacityProject *pProject)
 {
    pProject->RollbackState();
-   mCapturedTrack.reset();
-   mSnapManager.reset();
-   mClipMoveState.clear();
    return RefreshCode::RefreshAll;
 }
 
diff --git a/src/tracks/ui/TimeShiftHandle.h b/src/tracks/ui/TimeShiftHandle.h
index 232a4ac41..03c791bbd 100644
--- a/src/tracks/ui/TimeShiftHandle.h
+++ b/src/tracks/ui/TimeShiftHandle.h
@@ -51,7 +51,7 @@ public:
    explicit TimeShiftHandle
    ( const std::shared_ptr<Track> &pTrack, bool gripHit );
 
-   TimeShiftHandle &operator=(TimeShiftHandle&&) = default;
+   TimeShiftHandle &operator=(const TimeShiftHandle&) = default;
 
    bool IsGripHit() const { return mGripHit; }
    std::shared_ptr<Track> GetTrack() const { return mCapturedTrack; }
@@ -112,7 +112,7 @@ private:
    // line up with existing tracks or labels.  mSnapLeft and mSnapRight
    // are the horizontal index of pixels to display user feedback
    // guidelines so the user knows when such snapping is taking place.
-   std::unique_ptr<SnapManager> mSnapManager{};
+   std::shared_ptr<SnapManager> mSnapManager{};
 
    ClipMoveState mClipMoveState{};
    bool mGripHit {};