Handle InvalidChunkSizeException properly

sabihoshi · May 23, 2021 · c247105 · c247105
1 parent 952c5a8
commit c247105
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/GenshinLyreMidiPlayer.Data/Midi/MidiFile.cs b/GenshinLyreMidiPlayer.Data/Midi/MidiFile.cs
@@ -16,6 +16,7 @@ public MidiFile(string path, ReadingSettings? settings = null)
             _settings = settings;
 
             Path = path;
+            InitializeMidi();
         }
 
         public int Position
@@ -24,12 +25,14 @@ public int Position
             set => SetAndNotify(ref _position, value);
         }
 
-        public Melanchall.DryWetMidi.Core.MidiFile Midi => Melanchall.DryWetMidi.Core.MidiFile.Read(Path, _settings);
+        public Melanchall.DryWetMidi.Core.MidiFile Midi { get; private set; }
 
         public string Path { get; }
 
         public string Title => GetFileNameWithoutExtension(Path);
 
         public TimeSpan Duration => Midi.GetDuration<MetricTimeSpan>();
+
+        public void InitializeMidi() { Midi = Melanchall.DryWetMidi.Core.MidiFile.Read(Path, _settings); }
     }
 }
diff --git a/GenshinLyreMidiPlayer.WPF/GenshinLyreMidiPlayer.WPF.csproj b/GenshinLyreMidiPlayer.WPF/GenshinLyreMidiPlayer.WPF.csproj
@@ -6,7 +6,7 @@
     <UseWPF>true</UseWPF>
     <StartupObject>GenshinLyreMidiPlayer.WPF.App</StartupObject>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Version>2.0.0</Version>
+    <Version>2.0.1</Version>
     <ApplicationIcon>item_windsong_lyre.ico</ApplicationIcon>
     <Nullable>enable</Nullable>
     <RepositoryUrl>https://github.com/sabihoshi/GenshinLyreMidiPlayer</RepositoryUrl>

diff --git a/GenshinLyreMidiPlayer.WPF/ViewModels/LyrePlayerViewModel.cs b/GenshinLyreMidiPlayer.WPF/ViewModels/LyrePlayerViewModel.cs
@@ -134,7 +134,10 @@ public double SongPosition
         public async void Handle(MergeNotesNotification message)
         {
             if (!message.Merge)
+            {
+                Playlist.OpenedFile?.InitializeMidi();
                 InitializeTracks();
+            }
 
             await InitializePlayback();
         }