Emulation/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2024-05-14 18:19:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

MIDI: close files on error

Browse source
This commit is contained in:
Stephen West 2024-03-27 11:35:44 -06:00 committed by Filippos Karapetis
parent 0de5381038
commit e2fe9523e4
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
audio/softsynth/mt32.cpp
View file

@ -170,10 +170,15 @@ int MidiDriver_MT32::open() {
Common::File controlFile;
Common::File pcmFile;
if (!controlFile.open("CM32L_CONTROL.ROM") || !pcmFile.open("CM32L_PCM.ROM")) {
controlFile.close();
pcmFile.close();
debug("Unable to open CM32L_CONTROL.ROM / CM32L_PCM.ROM. Falling back to MT32");
if (!controlFile.open("MT32_CONTROL.ROM") || !pcmFile.open("MT32_PCM.ROM"))
if (!controlFile.open("MT32_CONTROL.ROM") || !pcmFile.open("MT32_PCM.ROM")) {
controlFile.close();
pcmFile.close();
error("Error opening (CM32L_CONTROL.ROM / CM32L_PCM.ROM) or (MT32_CONTROL.ROM / MT32_PCM.ROM). Check that your Extra Path in Paths settings is set to the correct directory");
}
}
_controlData = new byte[controlFile.size()];