From 4fc80dd5265297d1927f9c585d41fef0866a5a9c Mon Sep 17 00:00:00 2001 From: richardash1981 Date: Sun, 10 Mar 2013 16:57:27 +0000 Subject: [PATCH] When merging tracks, copy the gain and pan as well as the display format, and all are common to both tracks --- src/WaveTrack.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp index 6b8915b6a..105f35c80 100644 --- a/src/WaveTrack.cpp +++ b/src/WaveTrack.cpp @@ -130,7 +130,11 @@ void WaveTrack::Init(const WaveTrack &orig) void WaveTrack::Merge(const Track &orig) { if (orig.GetKind() == Wave) + { mDisplay = ((WaveTrack &)orig).mDisplay; + mGain = ((WaveTrack &)orig).mGain; + mPan = ((WaveTrack &)orig).mPan; + } Track::Merge(orig); }