From 9cb839ed1ca51e50ff46e73b91b5e71015acd15f Mon Sep 17 00:00:00 2001
From: Marius Ungureanu <marius.ungureanu@xamarin.com>
Date: Sat, 12 Sep 2015 19:03:02 +0300
Subject: [Mac] Fix NRE with accessory view on El Capitan

Bug 33897 - Add Files operation stopped working in 5.9.5 / Mac OS X
10.11
---
 main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs
index 87c62c87c9..fb0e5fe557 100644
--- a/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs
+++ b/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs
@@ -60,7 +60,8 @@ namespace MonoDevelop.MacIntegration
 					};
 					box.Layout ();
 					panel.AccessoryView = box.View;
-					box.Layout (box.View.Superview.Frame.Size);
+					if (box.View.Superview != null)
+						box.Layout (box.View.Superview.Frame.Size);
 				} else {
 					dropdownBox.Layout ();
 					panel.AccessoryView = dropdownBox.View;
-- 
cgit v1.2.3