Merge pull request #4 from Siketyan/develop

1.3.1
siketyan · Jun 10, 2017 · 0373e43 · 0373e43
2 parents 7ad7d00 + 6c60c2d
commit 0373e43
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/DisabledSongsWIndow.xaml.cs b/DisabledSongsWIndow.xaml.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.ObjectModel;
-using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Threading;
 
 namespace osu_Player
 {

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -103,10 +103,19 @@ private async void InitAsync(object sender, RoutedEventArgs e)
             var hsrc = PresentationSource.FromVisual(this) as HwndSource;
             hsrc.AddHook(WndProc);
 
-            if (!File.Exists("settings.json")) new Settings().Write();
+            if (!File.Exists("settings.json"))
+            {
+                new Settings { Version = Settings.VERSION }.Write();
+            }
+
             settings = Settings.Read();
-            if (settings.DisabledSongs == null) settings.DisabledSongs = new List<Song>();
+            if (settings.Version != Settings.VERSION)
+            {
+                MessageBox.Show("設定ファイルのバージョンが異なるため、使用できません。\n削除または移動してから再試行してください。");
+                Environment.Exit(0);
+            }
 
+            if (settings.DisabledSongs == null) settings.DisabledSongs = new List<Song>();
             if (settings.OsuPath == null)
             {
                 if (Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\osu!"))

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.12")]
-[assembly: AssemblyFileVersion("1.3.0.12")]
+[assembly: AssemblyVersion("1.3.1.13")]
+[assembly: AssemblyFileVersion("1.3.1.13")]
 [assembly: Guid("05EA8BF5-DA65-4EF0-BE35-B5CE28169F5E")]
 
diff --git a/Settings.cs b/Settings.cs
@@ -6,8 +6,12 @@ namespace osu_Player
 {
     public class Settings
     {
+        public const int VERSION = 0x01;
         private const string PATH = "settings.json";
 
+        [JsonProperty("version")]
+        public int? Version { get; set; }
+
         [JsonProperty("use_splash")]
         public bool UseSplashScreen { get; set; } = true;
 

diff --git a/SettingsWindow.xaml.cs b/SettingsWindow.xaml.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Windows;
-using osu_Player.Properties;
 using Un4seen.Bass;
 
 namespace osu_Player

diff --git a/Song.cs b/Song.cs
@@ -66,9 +66,9 @@ public Song(DirectoryInfo folder) : this()
             ThumbnailPath = MainWindow.GetInstance().settings.OsuPath + @"\Data\bt\" + id + ".jpg";
 
             if (!File.Exists(ThumbnailPath))
-            {
+                ThumbnailPath = MainWindow.GetInstance().settings.OsuPath + @"\Data\bt\" + id + "l.jpg";
+            if (!File.Exists(ThumbnailPath))
                 ThumbnailPath = "Resources/unknown.png";
-            }
 
             stream.Dispose();
         }