comparison data/model/ReadOnlyWaveFileModel.cpp @ 1221:a1b97df9962e 3.0-integration

Merge from branch msvc2015_64

 
 #include <QFileInfo>
 #include <QTextStream>
 
 #include <iostream>
-#include <unistd.h>
+//#include <unistd.h>
 #include <cmath>
 #include <sndfile.h>
 
 #include <cassert>
 

 
 #ifdef DEBUG_WAVE_FILE_MODEL
             cerr << "ReadOnlyWaveFileModel::fill inner loop: frame = " << frame << ", count = " << m_frameCount << ", blocksize " << readBlockSize << endl;
 #endif
 
-            if (updating && (frame + readBlockSize > m_frameCount)) break;
+            if (updating && (frame + readBlockSize > m_frameCount)) {
+                m_model.m_mutex.lock(); // must be locked on exiting loop
+                break;
+            }
 
             block = m_model.m_reader->getInterleavedFrames(frame, readBlockSize);
 
             sv_frame_t gotBlockSize = block.size() / channels;