From bbe37edb68f9e7535216bff80ba3e6b16cbca398 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Thu, 2 Feb 2017 09:47:23 -0500
Subject: Shiftnet, and audio fixes

---
 ShiftOS.WinForms/ShiftOSAudioProvider.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'ShiftOS.WinForms/ShiftOSAudioProvider.cs')

diff --git a/ShiftOS.WinForms/ShiftOSAudioProvider.cs b/ShiftOS.WinForms/ShiftOSAudioProvider.cs
index f217325..52cbc92 100644
--- a/ShiftOS.WinForms/ShiftOSAudioProvider.cs
+++ b/ShiftOS.WinForms/ShiftOSAudioProvider.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using ShiftOS.Engine;
@@ -19,18 +20,27 @@ namespace ShiftOS.WinForms
             }
         }
 
-        private float _vol = 1.0f;
 
         public float Volume
         {
             get
             {
-                return _vol;
+                if (SaveSystem.CurrentSave == null)
+                    return 1.0f;
+                try
+                {
+                    return SaveSystem.CurrentSave.Settings.audioVolume;
+                }
+                catch
+                {
+                    SaveSystem.CurrentSave.Settings.audioVolume = 1.0f;
+                    return 1.0f;
+                }
             }
 
             set
             {
-                _vol = value;
+                SaveSystem.CurrentSave.Settings.audioVolume = value;
             }
         }
 
-- 
cgit v1.2.3