diff --git a/MyCBZ/App.config b/MyCBZ/App.config index e9a1cac..2ceb22f 100644 --- a/MyCBZ/App.config +++ b/MyCBZ/App.config @@ -183,7 +183,7 @@ - 0.22.180b + 0.22.181b diff --git a/MyCBZ/Forms/MainForm.cs b/MyCBZ/Forms/MainForm.cs index 15bcd46..a227116 100644 --- a/MyCBZ/Forms/MainForm.cs +++ b/MyCBZ/Forms/MainForm.cs @@ -537,9 +537,20 @@ private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e) if (Win_CBZSettings.Default.RecentSavedArchivePath != null && Win_CBZSettings.Default.RecentSavedArchivePath.Length > 0) { - recentPath = new LocalFile(Win_CBZSettings.Default.RecentSavedArchivePath); + try + { + recentPath = new LocalFile(Win_CBZSettings.Default.RecentSavedArchivePath); + SaveArchiveDialog.InitialDirectory = Win_CBZSettings.Default.RecentSavedArchivePath; + } catch (ApplicationException ae) + { + if (ae.ShowErrorDialog) + { - SaveArchiveDialog.InitialDirectory = Win_CBZSettings.Default.RecentSavedArchivePath; + } + } catch (ArgumentNullException ane) + { + + } } DialogResult saveDialogResult = SaveArchiveDialog.ShowDialog(); @@ -549,9 +560,20 @@ private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e) PagesList.SelectedItem = null; if (Program.ProjectModel.SaveAs(SaveArchiveDialog.FileName, ZipArchiveMode.Update, MetaDataVersionFlavorHandler.GetInstance().HandlePageIndexVersion())) { - recentPath = new LocalFile(SaveArchiveDialog.FileName); + try + { + recentPath = new LocalFile(SaveArchiveDialog.FileName); + Win_CBZSettings.Default.RecentSavedArchivePath = recentPath.FilePath; + } catch (ApplicationException ae) + { + if (ae.ShowErrorDialog) + { - Win_CBZSettings.Default.RecentSavedArchivePath = recentPath.FilePath; + } + } catch (ArgumentNullException ane) + { + + } } } } diff --git a/MyCBZ/Models/LocalFile.cs b/MyCBZ/Models/LocalFile.cs index 28d9e52..6a4aea4 100644 --- a/MyCBZ/Models/LocalFile.cs +++ b/MyCBZ/Models/LocalFile.cs @@ -28,10 +28,20 @@ internal class LocalFile public LocalFile(String fileName) { + if (fileName == null) + { + throw new ArgumentNullException(nameof(fileName)); + } + FullPath = fileName; LocalFileInfo = new FileInfo(fileName); FileName = LocalFileInfo.Name; Name = Path.GetFileNameWithoutExtension(fileName); + if (LocalFileInfo.Directory == null) + { + throw new ApplicationException("LocalFile: Invalid Directory ('" + fileName + "')", true); + } + FilePath = LocalFileInfo.Directory.FullName + Path.DirectorySeparatorChar; try { diff --git a/MyCBZ/Properties/AssemblyInfo.cs b/MyCBZ/Properties/AssemblyInfo.cs index 806ac2e..bde693f 100644 --- a/MyCBZ/Properties/AssemblyInfo.cs +++ b/MyCBZ/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // indem Sie "*" wie unten gezeigt eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.22.180")] -[assembly: AssemblyFileVersion("0.22.180")] +[assembly: AssemblyVersion("0.22.181")] +[assembly: AssemblyFileVersion("0.22.181")] [assembly: NeutralResourcesLanguage("en")] diff --git a/MyCBZ/Win_CBZSettings.Designer.cs b/MyCBZ/Win_CBZSettings.Designer.cs index 290ab6a..7012a4a 100644 --- a/MyCBZ/Win_CBZSettings.Designer.cs +++ b/MyCBZ/Win_CBZSettings.Designer.cs @@ -37,7 +37,7 @@ public string TempFolderPath { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0.22.180b")] + [global::System.Configuration.DefaultSettingValueAttribute("0.22.181b")] public string InstalledVersion { get { return ((string)(this["InstalledVersion"])); diff --git a/MyCBZ/Win_CBZSettings.settings b/MyCBZ/Win_CBZSettings.settings index a9ca439..7dfbc83 100644 --- a/MyCBZ/Win_CBZSettings.settings +++ b/MyCBZ/Win_CBZSettings.settings @@ -6,7 +6,7 @@ %APPDATA%\WIN_CBZ\Temp\ - 0.22.180b + 0.22.181b <?xml version="1.0" encoding="utf-16"?> diff --git a/Readme.md b/Readme.md index f8aaa03..2467d8c 100644 --- a/Readme.md +++ b/Readme.md @@ -53,7 +53,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit) ## Latest Release -v0.22.180b released! +v0.22.181b released! >[!IMPORTANT] diff --git a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj index fd8f4c5..e3614ba 100644 --- a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj +++ b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj @@ -248,15 +248,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Win_CBZ" - "ProductCode" = "8:{4625E64F-63F5-47AA-B42B-C2DE480A4C96}" - "PackageCode" = "8:{19AA5FAF-43FD-4052-A489-3D92FD365C23}" + "ProductCode" = "8:{575CBDE8-0130-4D4F-A625-F70475008458}" + "PackageCode" = "8:{04E43D49-0C66-4047-A8BA-49F190B8CC8E}" "UpgradeCode" = "8:{66FAEF81-1CAE-4971-9E0F-796310EFEA5E}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.22.180" + "ProductVersion" = "8:0.22.181" "Manufacturer" = "8:Trash_s0Ft" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -808,7 +808,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1DAB07B3E40248E0B54293E16EE30178" { - "SourcePath" = "8:..\\MyCBZ\\obj\\x64\\Debug\\net8.0-windows7.0\\apphost.exe" + "SourcePath" = "8:..\\MyCBZ\\obj\\x64\\Release\\net8.0-windows7.0\\apphost.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_381C2AC7AD384E1488C6014F95032920"