From 47588baffc7f5d4460f07e2b3df22955b2430f8f Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 25 Aug 2020 10:10:07 -0400
Subject: [PATCH] Revert a piece of d420fde that miscompiles with MSVC

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

diff --git a/src/Track.h b/src/Track.h
index ca2b5ad1a..d8637ddf6 100644
--- a/src/Track.h
+++ b/src/Track.h
@@ -876,9 +876,10 @@ public:
    //! Return an iterator that replaces the predicate
    /*! Advance to the first position at or after the old position that satisfies the new predicate,
    or to the end */
-   TrackIter Filter( FunctionType pred2 ) const
+   template < typename Predicate2 >
+   TrackIter Filter( const Predicate2 &pred2 ) const
    {
-      return { this->mBegin, this->mIter, this->mEnd, std::move(pred2) };
+      return { this->mBegin, this->mIter, this->mEnd, pred2 };
    }
 
    //! Return an iterator for a subclass of TrackType (and not removing const) with same predicate