Fix crash if stereo mixing was interrupted

kryksyh · Oct 24, 2024 · 63e79a8 · 63e79a8
1 parent f7af870
commit 63e79a8
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
@@ -808,6 +808,9 @@ void WaveTrackMenuTable::OnMergeStereo(wxCommandEvent &)
       (WaveChannelView::GetFirst(*left).GetHeight() +
       WaveChannelView::GetFirst(*right).GetHeight()) / 2;
 
+   float origPanLeft = left->GetPan();
+   float origPanRight = right->GetPan();
+
    left->SetPan(-1.0f);
    right->SetPan(1.0f);
    auto mix = MixAndRender(
@@ -824,6 +827,13 @@ void WaveTrackMenuTable::OnMergeStereo(wxCommandEvent &)
       std::max(left->GetSampleFormat(), right->GetSampleFormat()),
       0.0, 0.0);
 
+   if (!mix)
+   {
+      left->SetPan(origPanLeft);
+      right->SetPan(origPanRight);
+      return;
+   }
+
    tracks.Insert(*first, mix);
    tracks.Remove(*left);
    tracks.Remove(*right);