Merge branch 'dev'

cadon · Jul 17, 2022 · bd3b68c · bd3b68c
2 parents 0135907 + 2b9b886
commit bd3b68c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/ARKBreedingStats/Form1.importSave.cs b/ARKBreedingStats/Form1.importSave.cs
@@ -107,7 +107,7 @@ await ImportSavegame.ImportCollectionFromSavegame(_creatureCollection, workingCo
                     tabControlMain.SelectedTab = tabPageLibrary;
 
                 // reapply last sorting
-                listViewLibrary.Sort();
+                SortLibrary();
 
                 UpdateTempCreatureDropDown();
 

diff --git a/ARKBreedingStats/Form1.library.cs b/ARKBreedingStats/Form1.library.cs
@@ -1126,9 +1126,14 @@ private string DisplayedCreatureCountdown(Creature cr, out Color foreColor, out
         private readonly CreatureListSorter _creatureListSorter = new CreatureListSorter();
 
         private void libraryListView_ColumnClick(object sender, ColumnClickEventArgs e)
+        {
+            SortLibrary(e.Column);
+        }
+
+        private void SortLibrary(int columnIndex = -1)
         {
             listViewLibrary.BeginUpdate();
-            _creaturesDisplayed = _creatureListSorter.DoSort(_creaturesDisplayed, e.Column);
+            _creaturesDisplayed = _creatureListSorter.DoSort(_creaturesDisplayed, columnIndex);
             _libraryListViewItemCache = null;
             listViewLibrary.EndUpdate();
         }
@@ -1957,7 +1962,7 @@ private void importFromTabSeparatedFileToolStripMenuItem_Click(object sender, Ev
                 tabControlMain.SelectedTab = tabPageLibrary;
 
             // reapply last sorting
-            listViewLibrary.Sort();
+            SortLibrary();
 
             MessageBoxes.ShowMessageBox(result, "Creatures imported from tsv file", MessageBoxIcon.Information);
         }

diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //      Revision
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.50.1.0")]
+[assembly: AssemblyFileVersion("0.50.1.1")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/_manifest.json b/ARKBreedingStats/_manifest.json
@@ -4,7 +4,7 @@
     "ARK Smart Breeding": {
       "Id": "ARK Smart Breeding",
       "Category": "main",
-      "version": "0.50.1.0"
+      "version": "0.50.1.1"
     },
     "SpeciesColorImages": {
       "Id": "SpeciesColorImages",