diff options
Diffstat (limited to 'main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs')
| -rw-r--r-- | main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs b/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs index 62ad087fe7..7aef34e322 100644 --- a/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs @@ -186,6 +186,11 @@ namespace MonoDevelop.MacIntegration.MainToolbar }; NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidResizeNotification, notif => { + // Skip updates with a null Window. Only crashes on Mavericks. + // The View gets updated once again when the window resize finishes. + if (bar.Window == null) + return; + double maxSize = Math.Round (bar.Window.Frame.Width * 0.30f); double minSize = Math.Round (bar.Window.Frame.Width * 0.25f); item.MinSize = new CGSize ((nfloat)Math.Max (280, minSize), 22); @@ -204,7 +209,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar { gtkWindow = window; widget = new NSToolbar (MainToolbarId) { - DisplayMode = NSToolbarDisplayMode.IconAndLabel, + DisplayMode = NSToolbarDisplayMode.Icon, }; widget.WillInsertItem = (tool, id, send) => { switch (id) { |