Fixed crashes when OLV objects collection is not yet initialized

Klocman · Apr 14, 2018 · 8f6c360 · 8f6c360
1 parent eb7822f
commit 8f6c360
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/source/BulkCrapUninstaller/Controls/RelatedUninstallerAdder.cs b/source/BulkCrapUninstaller/Controls/RelatedUninstallerAdder.cs
@@ -25,7 +25,7 @@ public RelatedUninstallerAdder()
             olvColumnName.AspectGetter = rowObject => ((RelatedApplicationEntry)rowObject).Entry.DisplayName;
         }
 
-        private IEnumerable<RelatedApplicationEntry> Entries => objectListView1.Objects.Cast<RelatedApplicationEntry>();
+        private IEnumerable<RelatedApplicationEntry> Entries => (objectListView1.Objects ?? Enumerable.Empty<RelatedApplicationEntry>()).Cast<RelatedApplicationEntry>();
 
         public IEnumerable<ApplicationUninstallerEntry> GetResults()
         {

diff --git a/source/BulkCrapUninstaller/Controls/UninstallConfirmation.cs b/source/BulkCrapUninstaller/Controls/UninstallConfirmation.cs
@@ -41,7 +41,7 @@ public UninstallConfirmation()
             objectListView1.HeaderStyle = ColumnHeaderStyle.Nonclickable;
         }
 
-        private IEnumerable<ConfirmationEntry> Entries => objectListView1.Objects.Cast<ConfirmationEntry>();
+        private IEnumerable<ConfirmationEntry> Entries => (objectListView1.Objects ?? Enumerable.Empty<ConfirmationEntry>()).Cast<ConfirmationEntry>();
 
         private void buttonSort_Click(object sender, EventArgs e)
         {