From 1d4087aa2a01dcf079989fb69fd3bc7abcff8c26 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Thu, 3 Feb 2022 22:20:43 +0100 Subject: [PATCH] Fixed music crashes * Fixed crash when trying to play an intro of a battle song that wasn't an ogg * Fixed crash when trying to resume the music after using the command @music.stop --- P3D/Resources/Sound/MusicManager.vb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/P3D/Resources/Sound/MusicManager.vb b/P3D/Resources/Sound/MusicManager.vb index 051cfd044..27fbad152 100644 --- a/P3D/Resources/Sound/MusicManager.vb +++ b/P3D/Resources/Sound/MusicManager.vb @@ -63,9 +63,9 @@ Public Class LoopStream Else If MusicManager._afterBattleIntroSong.AudioType = ".ogg" Then _sourceStream = New VorbisWaveReader(MusicManager._afterBattleIntroSong.Song) - ElseIf IntroSong.AudioType = ".mp3" Then + ElseIf MusicManager._afterBattleIntroSong.AudioType = ".mp3" Then _sourceStream = New Mp3FileReader(MusicManager._afterBattleIntroSong.Song) - ElseIf IntroSong.AudioType = ".wma" Then + ElseIf MusicManager._afterBattleIntroSong.AudioType = ".wma" Then _sourceStream = New MediaFoundationReader(MusicManager._afterBattleIntroSong.Song) End If _enableLooping = True @@ -334,9 +334,7 @@ Public Class MusicManager End Sub Public Shared Sub [Stop]() - If Not outputDevice Is Nothing Then - outputDevice.Stop() - End If + MusicManager.Play(NO_MUSIC, False, 0.0F) _isIntroStarted = False End Sub