Update of /cvsroot/audacity/audacity-src/src/import
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv950

Modified Files:
        ImportFLAC.cpp 
Log Message:
Prevent FLAC importer from crashing on files where mNumSamples is not available

Index: ImportFLAC.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportFLAC.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ImportFLAC.cpp      3 Jun 2008 14:26:57 -0000       1.27
+++ ImportFLAC.cpp      14 Jun 2008 17:15:25 -0000      1.28
@@ -249,7 +249,7 @@
 
    mFile->mSamplesDone += frame->header.blocksize;
 
-   if (!mFile->mProgress->Update((wxULongLong_t) mFile->mSamplesDone, 
(wxULongLong_t)mFile->mNumSamples)) {
+   if (!mFile->mProgress->Update((wxULongLong_t) mFile->mSamplesDone, 
mFile->mNumSamples != 0 ? (wxULongLong_t)mFile->mNumSamples : 1)) {
       mFile->mCancelled = true;
       return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
    }


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to