Merge remote-tracking branch 'origin/fix-media-player' into atys

fix_opengl_on_mac Live-831
Ulukyn 5 years ago
commit 83061f7f03

@ -434,7 +434,9 @@ void CMusicPlayer::stop ()
return; return;
// stop the music only if we are really playing (else risk to stop a background music!) // stop the music only if we are really playing (else risk to stop a background music!)
if (_State != Stopped)
SoundMngr->stopMusic(0); SoundMngr->stopMusic(0);
_State = Stopped; _State = Stopped;
_PlayStart = 0; _PlayStart = 0;
_PauseTime = 0; _PauseTime = 0;

Loading…
Cancel
Save