sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1170 from essej/filepool-copy-fix

Browse source 
Crash fix for reloading SFZ : needed to copy preloadCallCount in FilePool copy constructors
This commit is contained in:
redtide 2023-05-28 10:36:12 +02:00 • committed by GitHub
commit 28c3b10c17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sfizz/FilePool.h
View file

@ -90,6 +90,7 @@ struct FileData
information = std::move(other.information); information = std::move(other.information);
preloadedData = std::move(other.preloadedData); preloadedData = std::move(other.preloadedData);
fileData = std::move(other.fileData); fileData = std::move(other.fileData);
preloadCallCount = other.preloadCallCount;
availableFrames = other.availableFrames.load(); availableFrames = other.availableFrames.load();
lastViewerLeftAt = other.lastViewerLeftAt; lastViewerLeftAt = other.lastViewerLeftAt;
status = other.status.load(); status = other.status.load();
@ -100,6 +101,7 @@ struct FileData
information = std::move(other.information); information = std::move(other.information);
preloadedData = std::move(other.preloadedData); preloadedData = std::move(other.preloadedData);
fileData = std::move(other.fileData); fileData = std::move(other.fileData);
preloadCallCount = other.preloadCallCount;
availableFrames = other.availableFrames.load(); availableFrames = other.availableFrames.load();
lastViewerLeftAt = other.lastViewerLeftAt; lastViewerLeftAt = other.lastViewerLeftAt;
status = other.status.load(); status = other.status.load();