From e9479e6c2649ef1cfbc155e9b8d6da2cc44a1a1a Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 23 Jan 2016 20:31:11 -0500 Subject: [PATCH] Bug671: Really fixed by the fix for bug389, but this is some extra safety. --- src/WaveTrack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp index b6d8dabbf..478a90371 100644 --- a/src/WaveTrack.cpp +++ b/src/WaveTrack.cpp @@ -2577,7 +2577,7 @@ bool WaveTrack::MergeClips(int clipidx1, int clipidx2) WaveClip* clip1 = GetClipByIndex(clipidx1); WaveClip* clip2 = GetClipByIndex(clipidx2); - if (!clip2) // Could happen if one track of a linked pair had a split and the other didn't. + if (!clip1 || !clip2) // Could happen if one track of a linked pair had a split and the other didn't. return false; // Append data from second clip to first clip