Merge branch 'develop'

anoyetta · Dec 9, 2019 · 3ab3c38 · 3ab3c38
2 parents e67956a + 82d2e29
commit 3ab3c38
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/source/XIVNote/Note.cs b/source/XIVNote/Note.cs
@@ -15,9 +15,14 @@ namespace XIVNote
     [Serializable]
     public partial class Note : BindableBase
     {
-        public Note()
+        public void SetAutoSave()
         {
             this.PropertyChanged += (_, __) => Notes.Instance.EnqueueSave();
+
+            foreach (var image in this.ImageList)
+            {
+                image.SetAutoSave();
+            }
         }
 
         [XmlIgnore]
@@ -325,7 +330,7 @@ private async void ExecuteAddImageCommand()
                 var storeFileName = $"{Guid.NewGuid()}.png";
                 var storeFilePath = Path.Combine(@".\images", storeFileName);
 
-                // PNG形式に変換して保存する
+                // PNG形式に変換して保存する
                 await Task.Run(() =>
                 {
                     using (var ms = new WrappingStream(new MemoryStream(File.ReadAllBytes(fileName))))
@@ -407,7 +412,7 @@ private async void ExecuteRefreshCommand()
     [Serializable]
     public class NoteImage : BindableBase
     {
-        public NoteImage()
+        public void SetAutoSave()
         {
             this.PropertyChanged += (_, __) => Notes.Instance.EnqueueSave();
         }

diff --git a/source/XIVNote/Notes.cs b/source/XIVNote/Notes.cs
@@ -78,16 +78,21 @@ public void Load(
                             this.NoteList.AddRange(data, true);
                         }
                     }
-                }
-                finally
-                {
+
                     if (!this.NoteList.Any(x => x.IsDefault))
                     {
                         this.NoteList.Add(Note.DefaultNoteStyle);
                     }
 
                     this.NoteList.CollectionChanged += (_, __) => this.EnqueueSave();
 
+                    foreach (var note in this.NoteList)
+                    {
+                        note.SetAutoSave();
+                    }
+                }
+                finally
+                {
                     this.isLoading = false;
                 }
             }
@@ -338,13 +343,13 @@ private static void RefreshFFXIVIsActive()
         {
             try
             {
-                // フォアグラウンドWindowのハンドルを取得する
+                // フォアグラウンドWindowのハンドルを取得する
                 var hWnd = NativeMethods.GetForegroundWindow();
 
-                // プロセスIDに変換する
+                // プロセスIDに変換する
                 NativeMethods.GetWindowThreadProcessId(hWnd, out uint pid);
 
-                // フォアウィンドウのファイル名を取得する
+                // フォアウィンドウのファイル名を取得する
                 var p = Process.GetProcessById((int)pid);
                 if (p != null)
                 {

diff --git a/source/XIVNote/Properties/AssemblyInfo.cs b/source/XIVNote/Properties/AssemblyInfo.cs
@@ -15,4 +15,4 @@
     ResourceDictionaryLocation.None,
     ResourceDictionaryLocation.SourceAssembly
 )]
-[assembly: AssemblyVersion("2.1.4.0")]
+[assembly: AssemblyVersion("2.1.5.0")]
diff --git a/source/XIVNote/ViewModels/WidgetViewModel.cs b/source/XIVNote/ViewModels/WidgetViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using System.Windows.Threading;
 using aframe;
@@ -75,15 +75,15 @@ private static DispatcherTimer CreateAutoSaveTimer()
         {
             var timer = new DispatcherTimer(DispatcherPriority.ContextIdle)
             {
-                Interval = TimeSpan.FromSeconds(5),
+                Interval = TimeSpan.FromSeconds(7),
             };
 
             timer.Tick += async (_, __) =>
             {
                 if (IsSaveQueue)
                 {
                     IsSaveQueue = false;
-                    await Task.Run(Notes.Instance.Save);
+                    Notes.Instance.EnqueueSave();
                 }
             };