comparison data/fileio/CSVFileReader.cpp @ 1509:3299b42d8bdd import-audio-data

Don't try to continue after what should have been a terminal problem

         if (m_format.getColumnPurpose(i) == CSVFormat::ColumnValue) {
             ++valueColumns;
         }
     }
 
-    while (!in.atEnd()) {
+    bool abandoned = false;
+    
+    while (!in.atEnd() && !abandoned) {
 
         // QTextStream's readLine doesn't cope with old-style Mac
         // CR-only line endings.  Why did they bother making the class
         // cope with more than one sort of line ending, if it still
         // can't be configured to cope with all the common sorts?

 
         m_readCount += chunk.size() + 1;
 
         if (m_reporter) {
             if (m_reporter->wasCancelled()) {
+                abandoned = true;
                 break;
             }
             int progress;
             if (m_fileSize > 0) {
                 progress = int((double(m_readCount) / double(m_fileSize))

                     delete model;
                     model = 0;
                     model1 = 0; model2 = 0; model2a = 0; model2b = 0;
                     model3 = 0; modelW = 0;
                 }
+                abandoned = true;
                 break;
             }
             
             float value = 0.f;
             float pitch = 0.f;