Work around crash during GUI "find" operation

Repositioning a virtualized WPF TreeView control is hard. This doesn't fix the underlying problem, but does prevent the application from exploding. (issue #22)
fadden · Jun 30, 2024 · f3d3870 · f3d3870
1 parent d2a71ce
commit f3d3870
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/cp2_wpf/DirectoryTreeItem.cs b/cp2_wpf/DirectoryTreeItem.cs
@@ -202,7 +202,12 @@ internal static void BringItemIntoView(TreeView treeView, DirectoryTreeItem item
                 }
                 var tvItem = containerControl.ItemContainerGenerator.ContainerFromItem(dtItem);
                 containerControl = (ItemsControl)tvItem;
-                Debug.Assert(containerControl != null || stack.Count == 0);
+                if (containerControl == null && stack.Count != 0) {
+                    // This happens in weird circumstances, notably when the "find" feature
+                    // is blowing up.
+                    Debug.WriteLine("GLITCH while bringing TreeView item into view");
+                    break;
+                }
             }
         }
 

diff --git a/cp2_wpf/WPFCommon/WPFExtensions.cs b/cp2_wpf/WPFCommon/WPFExtensions.cs
@@ -456,7 +456,11 @@ public static class VirtualizingPanelExtensions {
         /// </summary>
         public static void BringIndexIntoView_Public(this VirtualizingPanel virtPanel, int index) {
             Debug.Assert(virtPanel != null);
-            BringIndexIntoViewMethodInfo.Invoke(virtPanel, new object[] { index });
+            try {
+                BringIndexIntoViewMethodInfo.Invoke(virtPanel, new object[] { index });
+            } catch (TargetInvocationException ex) {
+                Debug.WriteLine("BringIndexIntoView_Public GLITCH: " + ex);
+            }
         }
     }