Merge pull request #2440 from cwensley/curtis/mac-fix-treeview-nre

Mac: Fix occasional NRE with TreeView
picoe · Mar 8, 2023 · 5e4f31d · 5e4f31d
2 parents 7bc5c5b + db3d44c
commit 5e4f31d
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/Eto.Mac/Forms/Controls/TreeViewHandler.cs b/src/Eto.Mac/Forms/Controls/TreeViewHandler.cs
@@ -235,12 +235,18 @@ public TreeViewHandler Handler
 			/// </summary>
 			public override void DrawBackground(CGRect clipRect)
 			{
-				var backgroundColor = Handler.BackgroundColor;
-				if (backgroundColor != Colors.Transparent) {
-					backgroundColor.ToNSUI ().Set ();
-					NSGraphics.RectFill (clipRect);
-				} else
-					base.DrawBackground (clipRect);
+				var h = Handler;
+				if (h != null)
+				{
+					var backgroundColor = h.BackgroundColor;
+					if (backgroundColor != Colors.Transparent)
+					{
+						backgroundColor.ToNSUI().Set();
+						NSGraphics.RectFill(clipRect);
+						return;
+					}
+				}
+				base.DrawBackground (clipRect);
 			}
 
 			public EtoOutlineView()