From a37ab572542d372b941cdbc2db64ef82451cff69 Mon Sep 17 00:00:00 2001 From: cadon Date: Sun, 17 Jul 2022 23:27:54 +0200 Subject: [PATCH 1/2] import exception fix --- ARKBreedingStats/Form1.importSave.cs | 2 +- ARKBreedingStats/Form1.library.cs | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ARKBreedingStats/Form1.importSave.cs b/ARKBreedingStats/Form1.importSave.cs index 51061fff9..dc7fe8cf5 100644 --- 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 index 50e7f46a0..829433422 100644 --- 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); } From 2b9b88679d853963ce382757d4a38c51b4ca4f0e Mon Sep 17 00:00:00 2001 From: cadon Date: Sun, 17 Jul 2022 23:36:19 +0200 Subject: [PATCH 2/2] ver --- ARKBreedingStats/Properties/AssemblyInfo.cs | 2 +- ARKBreedingStats/_manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs index 5fa41f848..accc1dcaf 100644 --- 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 index 75f09c462..d9a517597 100644 --- 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",