Catch exception in pad initialization. Fixes #207

nosami · Apr 2, 2018 · 4031a6b · 4031a6b
1 parent f404023
commit 4031a6b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/XSVim/Properties/AssemblyInfo.fs b/XSVim/Properties/AssemblyInfo.fs
@@ -5,7 +5,7 @@ open System.Runtime.CompilerServices
 [<AutoOpen>]
 module AddinVersion =
     [<Literal>]
-    let version = "0.50.1"
+    let version = "0.50.2"
 
 [<assembly: AssemblyTitle("XSVim")>]
 [<assembly: AssemblyDescription("")>]

diff --git a/XSVim/TreeViewPads.fs b/XSVim/TreeViewPads.fs
@@ -2,7 +2,6 @@
 open System
 open Gtk
 open MonoDevelop.Ide
-open MonoDevelop.Ide.Gui
 open MonoDevelop.Ide.Gui.Components
 open MonoDevelop.Ide.Gui.Pads
 open Reflection
@@ -14,10 +13,16 @@ module treeViewPads =
         | Some workbench ->
             workbench.Pads
             |> List.ofSeq
-            |> List.map(fun pad -> pad.Content)
-            |> List.filter(fun pad -> pad :? TreeViewPad)
-            |> Seq.cast<TreeViewPad>
-        | None -> Seq.empty
+            |> List.choose(fun pad ->
+                try
+                    // fetching pad.Content can throw when there is an exception
+                    // when initializing the pad
+                    match pad.Content with
+                    | :? TreeViewPad as pad -> Some pad
+                    | _ -> None
+                with
+                | _ -> None)
+        | None -> List.empty
 
     let select (tree:TreeView) (iter:TreeIter ref) =
         tree.Selection.UnselectAll()