Merge pull request #38 from dan0v/master

Version 1.6.2
dan0v · Oct 1, 2024 · c3fff4f · c3fff4f
2 parents 0dc8033 + ef6b31c
commit c3fff4f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Models/Config.cs b/Models/Config.cs
@@ -87,6 +87,8 @@ public string XDeltaArguments
                 }
             }
         }
+
+        [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
         public string PatchFileDestination
         {
             get => _patchFileDestination;
@@ -120,6 +122,7 @@ public bool ShowFullPaths
                 {
                     _showFullPaths = value;
                     OnPropertyChanged();
+                    SaveCurrent();
                 }
             }
         }
@@ -132,6 +135,7 @@ public bool CopyExecutables
                 {
                     _copyExecutables = value;
                     OnPropertyChanged();
+                    SaveCurrent();
                 }
             }
         }
@@ -144,6 +148,7 @@ public bool ZipFilesWhenDone
                 {
                     _zipFilesWhenDone = value;
                     OnPropertyChanged();
+                    SaveCurrent();
                 }
             }
         }
@@ -176,7 +181,6 @@ public void LoadSaved()
                 Language = json.Language;
                 PatchExtention = json.PatchExtention;
                 PatchSubdirectory = json.PatchSubdirectory;
-                PatchFileDestination = json.PatchFileDestination;
                 XDeltaArguments = json.XDeltaArguments;
                 ZipName = json.ZipName;
                 ShowFullPaths = json.ShowFullPaths;

diff --git a/Windows/MainWindow.axaml.cs b/Windows/MainWindow.axaml.cs
@@ -728,7 +728,7 @@ private static string GetVersion()
             return (await StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
             {
                 Title = "Select output directory"
-            })).Select(folder => folder.Path.AbsolutePath).FirstOrDefault();
+            })).Select(folder => Uri.UnescapeDataString(folder.Path.AbsolutePath)).Where(f => Directory.Exists(f)).FirstOrDefault();
         }
 
         Window? GetWindow() => VisualRoot as Window;

diff --git a/xdelta3_cross_gui.csproj b/xdelta3_cross_gui.csproj
@@ -8,7 +8,7 @@
     <Authors>dan0v</Authors>
     <Description>A cross-platform graphical user interface for xDelta3 patching</Description>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
-    <Version>1.6.1</Version>
+    <Version>1.6.2</Version>
     <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>partial</TrimMode>
@@ -69,9 +69,9 @@
     <AvaloniaResource Include="Assets\img\up.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.11" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.11" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.11" />
+    <PackageReference Include="Avalonia" Version="11.1.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
   </ItemGroup>
   <ItemGroup>
     <AvaloniaXaml Update="Windows\Dialogs\InfoTextDialog.axaml">