Fixed issue with replays not getting renamed in case of using SortOnM…

…atchup with a filter
CrispyDrone · Jun 30, 2019 · 9f2a297 · 9f2a297
1 parent 3020103
commit 9f2a297
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Main/ReplayParser.ReplaySorter.UI/ReplayParser.ReplaySorter.UI.csproj b/Main/ReplayParser.ReplaySorter.UI/ReplayParser.ReplaySorter.UI.csproj
@@ -31,7 +31,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <PublishUrl>C:\Users\Eigenaar\Desktop\Computer Science\Projects\Published\v1.0\</PublishUrl>
+    <PublishUrl>C:\Users\Eigenaar\Desktop\Computer Science\Projects\Published\BWSort\v1.0\Installer\Application\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -45,7 +45,7 @@
     <ErrorReportUrl>https://github.com/CrispyDrone/BWSort/issues</ErrorReportUrl>
     <TargetCulture>en</TargetCulture>
     <ProductName>BWSort</ProductName>
-    <ApplicationRevision>4</ApplicationRevision>
+    <ApplicationRevision>6</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

diff --git a/Main/ReplayParser.ReplaySorter/Sorting/Sorter/Sorter.cs b/Main/ReplayParser.ReplaySorter/Sorting/Sorter/Sorter.cs
@@ -264,7 +264,7 @@ public void ExecuteSort(SortCriteriaParameters sortcriteriaparameters, bool keep
             for (int i = 0; i < CriteriaStringOrder.Length; i++)
             {
                 // should I pass a new sorter instead of this?? Then I don't have to make separate property OriginalDirectory
-                var SortOnX = Factory.GetSortCommand((Criteria)Enum.Parse(typeof(Criteria), CriteriaStringOrder[i]), sortcriteriaparameters, i == CriteriaStringOrder.Length - 1 ? keeporiginalreplaynames : true, this);
+                var SortOnX = Factory.GetSortCommand((Criteria)Enum.Parse(typeof(Criteria), CriteriaStringOrder[i]), sortcriteriaparameters, i == 0 ? keeporiginalreplaynames : true, this);
                 if (i == 0)
                 {
                     SortOnXResult = SortOnX.Sort(replaysThrowingExceptions);
@@ -290,7 +290,7 @@ public DirectoryFileTree ExecuteSortAsync(bool keeporiginalreplaynames, Backgrou
             for (int i = 0; i < CriteriaStringOrder.Length; i++)
             {
                 // should I pass a new sorter instead of this?? Then I don't have to make separate property OriginalDirectory
-                var SortOnX = Factory.GetSortCommand((Criteria)Enum.Parse(typeof(Criteria), CriteriaStringOrder[i]), SortCriteriaParameters, i == CriteriaStringOrder.Length - 1 ? keeporiginalreplaynames : true, this);
+                var SortOnX = Factory.GetSortCommand((Criteria)Enum.Parse(typeof(Criteria), CriteriaStringOrder[i]), SortCriteriaParameters, i == 0 ? keeporiginalreplaynames : true, this);
                 if (i == 0)
                 {
                     SortOnXResult = SortOnX.SortAsync(replaysThrowingExceptions, worker_ReplaySorter, i + 1, CriteriaStringOrder.Count());
@@ -325,7 +325,7 @@ public DirectoryFileTree PreviewSort(bool keepOriginalReplayNames, BackgroundWor
             IDictionary<string, List<File<IReplay>>> SortOnXResult = new Dictionary<string, List<File<IReplay>>>();
             for (int i = 0; i < CriteriaStringOrder.Length; i++)
             {
-                var SortOnX = Factory.GetSortCommand((Criteria)Enum.Parse(typeof(Criteria), CriteriaStringOrder[i]), SortCriteriaParameters, i == CriteriaStringOrder.Length - 1 ? keepOriginalReplayNames : true, this);
+                var SortOnX = Factory.GetSortCommand((Criteria)Enum.Parse(typeof(Criteria), CriteriaStringOrder[i]), SortCriteriaParameters, i == 0 ? keepOriginalReplayNames : true, this);
                 if (i == 0)
                 {
                     SortOnXResult = SortOnX.PreviewSort(replaysThrowingExceptions, worker_ReplaySorter, i + 1, CriteriaStringOrder.Count());