[Traverso-commit] traverso/src/core AudioFileMerger.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/11/27 14:16:16

Modified files:
        src/core       : AudioFileMerger.cpp 

Log message:
        * do not emit taskFinished() signal when user stopped merging

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioFileMerger.cpp?cvsroot=traverso&r1=1.5&r2=1.6

Patches:
Index: AudioFileMerger.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioFileMerger.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- AudioFileMerger.cpp 23 Nov 2007 21:19:17 -0000      1.5
+++ AudioFileMerger.cpp 27 Nov 2007 14:16:16 -0000      1.6
@@ -150,8 +150,6 @@
        delete [] spec->dataF;
        delete spec;
        
-       emit taskFinished(name.left(length-28));
-       
        //  The user asked to stop processing, exit the event loop
        // and signal we're done.
        if (m_stopMerging) {
@@ -159,7 +157,10 @@
                wait(1000);
                m_tasks.clear();
                emit processingStopped();
+               return;
        }
+       
+       emit taskFinished(name.left(length-28));
 }
 
 void AudioFileMerger::stop_merging()