aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS_TheReturn/AudioManager.cs
diff options
context:
space:
mode:
authorwilliam341 <[email protected]>2017-06-24 10:53:22 -0700
committerGitHub <[email protected]>2017-06-24 10:53:22 -0700
commitbae34710cf86240b2744196c4b95e569fb161c90 (patch)
treed5ff99e5cc8f3db8a9236b247886866601b915b9 /ShiftOS_TheReturn/AudioManager.cs
parentb4b19e7a4d203b58537f5b98214296ab52c49b2d (diff)
parent1661f9a5bd46dbd7d2586787c55bfc407c027629 (diff)
downloadshiftos_thereturn-bae34710cf86240b2744196c4b95e569fb161c90.tar.gz
shiftos_thereturn-bae34710cf86240b2744196c4b95e569fb161c90.tar.bz2
shiftos_thereturn-bae34710cf86240b2744196c4b95e569fb161c90.zip
Merge pull request #5 from shiftos-game/master
merge
Diffstat (limited to 'ShiftOS_TheReturn/AudioManager.cs')
-rw-r--r--ShiftOS_TheReturn/AudioManager.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/ShiftOS_TheReturn/AudioManager.cs b/ShiftOS_TheReturn/AudioManager.cs
index 0950b55..85e1371 100644
--- a/ShiftOS_TheReturn/AudioManager.cs
+++ b/ShiftOS_TheReturn/AudioManager.cs
@@ -125,10 +125,14 @@ namespace ShiftOS.Engine
}
if (play)
{
- while(_out.PlaybackState == PlaybackState.Playing)
+ try
{
- Thread.Sleep(10);
+ while (_out.PlaybackState == PlaybackState.Playing)
+ {
+ Thread.Sleep(10);
+ }
}
+ catch { }
ShiftOS.Engine.AudioManager.Stop();
_out = new WaveOut();
var mp3 = new WaveFileReader(str);