don't load assets when loading temp ins

This commit is contained in:
tildearrow 2022-11-21 03:01:57 -05:00
parent 82649c9c81
commit 0627e38d63
4 changed files with 9 additions and 5 deletions

View file

@ -1814,7 +1814,7 @@ void DivEngine::loadWOPN(SafeReader& reader, std::vector<DivInstrument*>& ret, S
}
}
std::vector<DivInstrument*> DivEngine::instrumentFromFile(const char* path) {
std::vector<DivInstrument*> DivEngine::instrumentFromFile(const char* path, bool loadAssets) {
std::vector<DivInstrument*> ret;
warnings="";
@ -1919,7 +1919,7 @@ std::vector<DivInstrument*> DivEngine::instrumentFromFile(const char* path) {
reader.seek(dataPtr,SEEK_SET);
}
if (ins->readInsData(reader,version,&song)!=DIV_DATA_SUCCESS) {
if (ins->readInsData(reader,version,loadAssets?(&song):NULL)!=DIV_DATA_SUCCESS) {
lastError="invalid instrument header/data!";
delete ins;
delete[] buf;