zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Creating an OPL MIDI device can fail if no GENMIDI lump is found, and an exception is thrown. We need to handle this exception to prevent an abort.

Browse source
This commit is contained in:
Christoph Oelckers 2014-10-24 22:56:10 +02:00
parent 9402bcf6cd
commit e662e4321a
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/sound/music_midistream.cpp
View file

@ -38,6 +38,7 @@
#include "templates.h"
#include "doomdef.h"
#include "m_swap.h"
#include "doomerrors.h"
// MACROS ------------------------------------------------------------------
@ -277,7 +278,16 @@ MIDIDevice *MIDIStreamer::CreateMIDIDevice(EMidiDevice devtype) const
return new TimidityMIDIDevice;
case MDEV_OPL:
return new OPLMIDIDevice;
try
{
return new OPLMIDIDevice;
}
catch (CRecoverableError &err)
{
// The creation of an OPL MIDI device can abort with an error if no GENMIDI lump can be found.
Printf("Unable to create OPL MIDI device: %s\nFalling back to FModEx playback", err.GetMessage());
return new FMODMIDIDevice;
}
case MDEV_TIMIDITY:
return new TimidityPPMIDIDevice;