Merge pull request #975 from cadon/dev

merge to master
cadon · Oct 8, 2019 · 1819602 · 1819602
2 parents 15ccca5 + fcad741
commit 1819602
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ARKBreedingStats/BreedingPlan.cs b/ARKBreedingStats/BreedingPlan.cs
@@ -794,7 +794,10 @@ public Species CurrentSpecies
         private void listViewSpeciesBP_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (listViewSpeciesBP.SelectedIndices.Count > 0
-                && listViewSpeciesBP.SelectedItems[0].Text != currentSpecies.DescriptiveNameAndMod)
+                && !string.IsNullOrEmpty(listViewSpeciesBP.SelectedItems[0]?.Text)
+                && (currentSpecies == null
+                    || listViewSpeciesBP.SelectedItems[0].Text != currentSpecies.DescriptiveNameAndMod)
+                )
             {
                 SetGlobalSpecies?.Invoke((Species)((ListViewItem)listViewSpeciesBP.SelectedItems[0]).Tag);
             }

diff --git a/ARKBreedingStats/Form1.collection.cs b/ARKBreedingStats/Form1.collection.cs
@@ -431,7 +431,8 @@ private bool LoadCollectionFile(string filePath, bool keepCurrentCreatures = fal
                 || !creatureCollection.creatures.Any(c => c.Species.Equals(selectedlibrarySpecies))
                 )
                 selectedlibrarySpecies = speciesSelector1.SelectedSpecies;
-            listBoxSpeciesLib.SelectedIndex = listBoxSpeciesLib.Items.IndexOf(selectedlibrarySpecies);
+            if (selectedlibrarySpecies != null)
+                listBoxSpeciesLib.SelectedIndex = listBoxSpeciesLib.Items.IndexOf(selectedlibrarySpecies);
 
             filterListAllowed = true;
             FilterLib();