First win10 commit

xenolightning · Apr 23, 2015 · 168e8de · 168e8de
1 parent d21e7ca
commit 168e8de
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/FortyOne.AudioSwitcher/AudioSwitcher.cs b/FortyOne.AudioSwitcher/AudioSwitcher.cs
@@ -1224,7 +1224,7 @@ public string AssemblyTitle
 
         public string AssemblyVersion
         {
-            get { return Assembly.GetExecutingAssembly().GetName().Version.ToString(); }
+            get { return FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion; }
         }
 
         public string AssemblyDescription

diff --git a/FortyOne.AudioSwitcher/Configuration/JsonSettings.cs b/FortyOne.AudioSwitcher/Configuration/JsonSettings.cs
@@ -1,9 +1,6 @@
-using fastJSON;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
+using fastJSON;
 
 namespace FortyOne.AudioSwitcher.Configuration
 {
@@ -20,14 +17,17 @@ public void SetFilePath(string path)
 
         public void Load()
         {
-            try
-            {
-                if (File.Exists(_path))
-                    _settingsObject = fastJSON.JSON.ToObject<Dictionary<string, string>>(File.ReadAllText(_path));
-            }
-            catch
+            lock (_mutex)
             {
-                _settingsObject = new Dictionary<string, string>();
+                try
+                {
+                    if (File.Exists(_path))
+                        _settingsObject = JSON.ToObject<Dictionary<string, string>>(File.ReadAllText(_path));
+                }
+                catch
+                {
+                    _settingsObject = new Dictionary<string, string>();
+                }
             }
         }
 
@@ -41,7 +41,7 @@ public string Get(string key)
         {
             lock (_mutex)
             {
-                return _settingsObject[key].ToString();
+                return _settingsObject[key];
             }
         }
 

diff --git a/FortyOne.AudioSwitcher/Properties/AssemblyInfo.cs b/FortyOne.AudioSwitcher/Properties/AssemblyInfo.cs
@@ -36,6 +36,7 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.6.4.2")]
-[assembly: AssemblyFileVersion("1.6.4.2")]
+[assembly: AssemblyVersion("1.6.5.0")]
+[assembly: AssemblyFileVersion("1.6.5.0")]
+[assembly: AssemblyInformationalVersion("1.6.5.0-rc1")]
 [assembly: NeutralResourcesLanguageAttribute("")]