From 7b2dfa0c26590487e9ac704025b4671d762063a9 Mon Sep 17 00:00:00 2001 From: Nain Date: Sat, 15 Oct 2022 03:11:01 -0300 Subject: [PATCH] v1.4.2 --- .gitignore | 2 +- BackupHelper/FormOptionsMenu.cs | 18 +++++++++--------- BackupHelper/Properties/AssemblyInfo.cs | 4 ++-- CHANGELOG.md | 5 +++++ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 8524d10..7fa51c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /packages -/test +/BackupHelper/test ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. diff --git a/BackupHelper/FormOptionsMenu.cs b/BackupHelper/FormOptionsMenu.cs index c93accb..31543a2 100644 --- a/BackupHelper/FormOptionsMenu.cs +++ b/BackupHelper/FormOptionsMenu.cs @@ -348,8 +348,16 @@ private void ButtonExecute_Click(object sender, EventArgs args) return; } + List options = Options.OrderBy(o => o.ListViewIndex).Select(o => o.Clone()).ToList(); + foreach (Options o in options) + { + if (!o.AllowIgnoreFileExt) o.SpecifiedFileNamesAndExtensions.Clear(); //-- Names must be ignored + o.SourcePath = Environment.ExpandEnvironmentVariables(o.SourcePath); + o.DestinyPath = Environment.ExpandEnvironmentVariables(o.DestinyPath); + } + FileControl = new FileControlImpl(this); - progressBarOptions.Maximum = FileControl.FilesTotal(Options.ToList()); + progressBarOptions.Maximum = FileControl.FilesTotal(options.ToList()); //this.OptionIsExecuting = true; LogManager.BeginWritter(); @@ -367,14 +375,6 @@ private void ButtonExecute_Click(object sender, EventArgs args) buttonCancel.Visible = true; buttonCancel.BackColor = Color.FromArgb(255, 128, 128); - List options = Options.OrderBy(o => o.ListViewIndex).Select(o => o.Clone()).ToList(); - foreach (Options o in options) - { - if (!o.AllowIgnoreFileExt) o.SpecifiedFileNamesAndExtensions.Clear(); //-- Names must be ignored - o.SourcePath = Environment.ExpandEnvironmentVariables(o.SourcePath); - o.DestinyPath = Environment.ExpandEnvironmentVariables(o.DestinyPath); - } - Program.UpdateLastTimeExecuted(Profile); ExecutionThread = new Thread(() => diff --git a/BackupHelper/Properties/AssemblyInfo.cs b/BackupHelper/Properties/AssemblyInfo.cs index cb4d389..7dd14fb 100644 --- a/BackupHelper/Properties/AssemblyInfo.cs +++ b/BackupHelper/Properties/AssemblyInfo.cs @@ -7,6 +7,6 @@ [assembly: AssemblyProduct("BackupHelper")] [assembly: AssemblyCopyright("Copyright © Nain 2021")] [assembly: AssemblyTrademark("Nain")] -[assembly: AssemblyVersion("1.4.1")] -[assembly: AssemblyFileVersion("1.4.1")] +[assembly: AssemblyVersion("1.4.2")] +[assembly: AssemblyFileVersion("1.4.2")] [assembly: NeutralResourcesLanguage("en-US")] diff --git a/CHANGELOG.md b/CHANGELOG.md index e44e6cd..4b40858 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.4.2 + +Fixed/altered: +- Execution for source paths containing environment variables - fix + ## 1.4.1 Fixed/altered: