FModel 3.1.1.1

4sval · Jul 25, 2020 · a114956 · a114956
1 parent a7f7279
commit a114956
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 27 deletions.
diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
@@ -8,8 +8,8 @@
     <StartupObject>FModel.App</StartupObject>
     <Authors>Asval</Authors>
     <Company></Company>
-    <AssemblyVersion>3.1.1.0</AssemblyVersion>
-    <FileVersion>3.1.1.0</FileVersion>
+    <AssemblyVersion>3.1.1.1</AssemblyVersion>
+    <FileVersion>3.1.1.1</FileVersion>
     <PackageIcon>FModel.ico</PackageIcon>
     <PackageIconUrl />
     <PackageProjectUrl>https://github.com/iAmAsval/FModel</PackageProjectUrl>

diff --git a/FModel/Utils/Updater.cs b/FModel/Utils/Updater.cs
@@ -46,7 +46,7 @@ private static void CheckForUpdateEvent(UpdateInfoEventArgs args)
                         Properties.Resources.No);
 
                     if (dialogResult == MessageBoxResult.Yes)
-                        new ProcessStartInfo { FileName = args.ChangelogURL, UseShellExecute = true };
+                        Process.Start(new ProcessStartInfo { FileName = args.ChangelogURL, UseShellExecute = true });
 
                     if (dialogResult == MessageBoxResult.Yes || dialogResult == MessageBoxResult.No || dialogResult == MessageBoxResult.OK)
                     {

diff --git a/FModel/ViewModels/MenuItem/BackupMenuItemViewModel.cs b/FModel/ViewModels/MenuItem/BackupMenuItemViewModel.cs
@@ -160,38 +160,38 @@ await Task.Run(() =>
                         StatusBarVm.statusBarViewModel.Set(string.Format(Properties.Resources.MountedPakTo, pakFile.FileName, pakFile.MountPoint), Properties.Resources.Loading);
                     }
                     
-                    foreach (var entry in pakFile)
+                    foreach (var (_, entry) in pakFile)
                     {
                         // uasset or umap or idk
-                        writer.Write(entry.Value.Offset);
-                        writer.Write(entry.Value.Size);
-                        writer.Write(entry.Value.UncompressedSize);
-                        writer.Write(entry.Value.Encrypted);
-                        writer.Write(entry.Value.StructSize);
-                        writer.Write(pakFile.MountPoint + entry.Value.Name);
-                        writer.Write(entry.Value.CompressionMethodIndex);
+                        writer.Write(entry.Offset);
+                        writer.Write(entry.Size);
+                        writer.Write(entry.UncompressedSize);
+                        writer.Write(entry.Encrypted);
+                        writer.Write(entry.StructSize);
+                        writer.Write(pakFile.MountPoint + entry.Name);
+                        writer.Write(entry.CompressionMethodIndex);
 
                         // uexp
-                        if (entry.Value.Uexp != null)
+                        if (entry.Uexp != null)
                         {
-                            writer.Write(entry.Value.Uexp.Offset);
-                            writer.Write(entry.Value.Uexp.Size);
-                            writer.Write(entry.Value.Uexp.UncompressedSize);
-                            writer.Write(entry.Value.Uexp.Encrypted);
-                            writer.Write(entry.Value.Uexp.StructSize);
-                            writer.Write(pakFile.MountPoint + entry.Value.Uexp.Name);
-                            writer.Write(entry.Value.Uexp.CompressionMethodIndex);
+                            writer.Write(entry.Uexp.Offset);
+                            writer.Write(entry.Uexp.Size);
+                            writer.Write(entry.Uexp.UncompressedSize);
+                            writer.Write(entry.Uexp.Encrypted);
+                            writer.Write(entry.Uexp.StructSize);
+                            writer.Write(pakFile.MountPoint + entry.Uexp.Name);
+                            writer.Write(entry.Uexp.CompressionMethodIndex);
                         }
                         // ubulk
-                        if (entry.Value.Ubulk != null)
+                        if (entry.Ubulk != null)
                         {
-                            writer.Write(entry.Value.Ubulk.Offset);
-                            writer.Write(entry.Value.Ubulk.Size);
-                            writer.Write(entry.Value.Ubulk.UncompressedSize);
-                            writer.Write(entry.Value.Ubulk.Encrypted);
-                            writer.Write(entry.Value.Ubulk.StructSize);
-                            writer.Write(pakFile.MountPoint + entry.Value.Ubulk.Name);
-                            writer.Write(entry.Value.Ubulk.CompressionMethodIndex);
+                            writer.Write(entry.Ubulk.Offset);
+                            writer.Write(entry.Ubulk.Size);
+                            writer.Write(entry.Ubulk.UncompressedSize);
+                            writer.Write(entry.Ubulk.Encrypted);
+                            writer.Write(entry.Ubulk.StructSize);
+                            writer.Write(pakFile.MountPoint + entry.Ubulk.Name);
+                            writer.Write(entry.Ubulk.CompressionMethodIndex);
                         }
                     }
                 }

diff --git a/FModel/Windows/SoundPlayer/AudioPlayer.xaml.cs b/FModel/Windows/SoundPlayer/AudioPlayer.xaml.cs
@@ -182,6 +182,11 @@ private void OnPlayPauseClick(object sender, RoutedEventArgs e)
                     output.Resume();
                     PlayPauseImg.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/pause.png"));
                 }
+                else if (output.IsStopped)
+                {
+                    output.Play();
+                    PlayPauseImg.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/pause.png"));
+                }
             }
             else
             {
@@ -232,6 +237,7 @@ private void Output_SourcePropertyChangedEvent(object sender, SourcePropertyChan
                 case ESourceProperty.PlaybackState:
                     if (output != null && output.Position == output.Length && (PlaybackState)e.Value == PlaybackState.Stopped)
                     {
+                        output.Stop();
                         Application.Current.Dispatcher.Invoke(delegate
                         {
                             PlayPauseImg.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/play.png"));