From b45d4dd998c3c72dd99b2ef350fdb8754b870ab8 Mon Sep 17 00:00:00 2001 From: "v.audacity" Date: Thu, 1 Mar 2012 02:11:09 +0000 Subject: [PATCH] further fix for additional P1 "repeatable crash set format to 16-bit..." thread, Gale's msg of 2012-02-29 --- src/Sequence.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Sequence.cpp b/src/Sequence.cpp index cc1e71984..3f695b385 100644 --- a/src/Sequence.cpp +++ b/src/Sequence.cpp @@ -435,7 +435,7 @@ bool Sequence::Copy(sampleCount s0, sampleCount s1, Sequence **dest) blocklen = (mBlock->Item(b0)->start + mBlock->Item(b0)->f->GetLength() - s0); if (blocklen > (s1 - s0)) blocklen = s1 - s0; - wxASSERT(blocklen <= mMaxSamples); // Vaughan, 2011-10-19 + wxASSERT(mBlock->Item(b0)->f->IsAlias() || (blocklen <= mMaxSamples)); // Vaughan, 2012-02-29 Get(buffer, mSampleFormat, s0, blocklen); (*dest)->Append(buffer, mSampleFormat, blocklen); @@ -451,7 +451,7 @@ bool Sequence::Copy(sampleCount s0, sampleCount s1, Sequence **dest) // Do the last block if (b1 > b0 && b1 < numBlocks) { blocklen = (s1 - mBlock->Item(b1)->start); - wxASSERT(blocklen <= mMaxSamples); // Vaughan, 2011-10-19 + wxASSERT(mBlock->Item(b0)->f->IsAlias() || (blocklen <= mMaxSamples)); // Vaughan, 2012-02-29 Get(buffer, mSampleFormat, mBlock->Item(b1)->start, blocklen); (*dest)->Append(buffer, mSampleFormat, blocklen); }