From d869f78ab9019aed5bb701f17338099144b3799d Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Fri, 6 Mar 2020 17:24:03 -0500 Subject: [PATCH] Revert fix for Bug 2346, which made a dependency cycle --- src/Track.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Track.cpp b/src/Track.cpp index 1d4ba0478..43f512852 100644 --- a/src/Track.cpp +++ b/src/Track.cpp @@ -24,7 +24,6 @@ and TimeTrack. #include "Audacity.h" // for USE_* macros #include "Track.h" -#include "WaveTrack.h" // for preserving colour. #include "Experimental.h" @@ -776,13 +775,6 @@ auto TrackList::Replace(Track * t, const ListOfTracks::value_type &with) -> pTrack->SetId( t->GetId() ); RecalcPositions(node); - // Fix for Bug 2346. Preserve colour when replacing tracks. - WaveTrack * wt1 = dynamic_cast(t); - WaveTrack * wt2 = dynamic_cast(pTrack); - if (wt1 && wt2) { - wt2->SetWaveColorIndex(wt1->GetWaveColorIndex()); - } - DeletionEvent(node); AdditionEvent(node); }