zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Similar fix to the previous: The child TiMidity++ process quitting would not necessarily be 

detected, so S_ChangeMusic() would not restart one-shot songs that had finished if it was
  the MIDI device.

SVN r3463 (trunk)
This commit is contained in:
Randy Heit 2012-03-22 21:23:18 +00:00
parent 78d28dedda
commit cd122f944b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sound/music_midistream.cpp
View File

@ -518,7 +518,11 @@ void MIDIStreamer::Stop()
bool MIDIStreamer::IsPlaying()
{
if (EndQueued != 0 && EndQueued < 4)
if (m_Status != STATE_Stopped && MIDI == NULL || (EndQueued != 0 && EndQueued < 4))
{
Stop();
}
if (m_Status != STATE_Stopped && !MIDI->IsOpen())
{
Stop();
}