Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorMarius Ungureanu <marius.ungureanu@xamarin.com>2015-09-12 19:03:02 +0300
committerMarius Ungureanu <marius.ungureanu@xamarin.com>2015-09-12 19:30:18 +0300
commit9cb839ed1ca51e50ff46e73b91b5e71015acd15f (patch)
treec26e028914308566b15d4e6b46bcfd302e78f983 /main
parent21b9aaf1390d4148da8b3e413a3862715123fe5f (diff)
[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
Diffstat (limited to 'main')
-rw-r--r--main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs3
1 files changed, 2 insertions, 1 deletions
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;