Merge pull request rubberduck-vba#4689 from machthree/fix#3831

The test explorer view throws on shutdown rubberduck-vba#4685
rkapka · Jan 3, 2019 · 1d11646 · 1d11646
2 parents f105933 + 11edee8
commit 1d11646
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml.cs b/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml.cs
@@ -85,11 +85,14 @@ private void ResultsGroupingGrid_IsVisibleChanged(object sender, System.Windows.
                         _newGroupingGrid = groupingGrid;
                     else
                     {
-                        // copy column widths from previously visible grouping grid to ensure widths are consistent
-                        for (int columnIndex = 0; columnIndex < groupingGrid.Columns.Count; columnIndex++)
+                        if (!(_newGroupingGrid is null))
                         {
-                            // copy column widths from current now hidden columns to the new visible columns
-                            _newGroupingGrid.Columns[columnIndex].Width = groupingGrid.Columns[columnIndex].Width;
+                            // copy column widths from previously visible grouping grid to ensure widths are consistent
+                            for (int columnIndex = 0; columnIndex < groupingGrid.Columns.Count; columnIndex++)
+                            {
+                                // copy column widths from current now hidden columns to the new visible columns
+                                _newGroupingGrid.Columns[columnIndex].Width = groupingGrid.Columns[columnIndex].Width;
+                            }
                         }
                     }
                 }