diff options
| author | Greg Munn <greg@sgmunn.com> | 2016-02-26 22:42:08 +0300 |
|---|---|---|
| committer | Greg Munn <greg@sgmunn.com> | 2016-02-26 22:42:08 +0300 |
| commit | 7ad4a03f67290e2192b3fa1dfbb3e50f74611e70 (patch) | |
| tree | 402078847b82b53b30248603f96bc4e6522b6535 /main | |
| parent | 94e04ea3bad1ade0e16dfc50251c9c353ccbe701 (diff) | |
| parent | 9845c24e9052f41df3f28a345599439982c0f514 (diff) | |
Merge pull request #1218 from mono/cycle6-bug34719
[Mac] Fix crasher in toolbar when a tooltip for a status layer wasn't
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/addins/MacPlatform/MainToolbar/StatusBar.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs index 077be842ea..8f2ada5e18 100644 --- a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs @@ -705,13 +705,14 @@ namespace MonoDevelop.MacIntegration.MainToolbar ((NSTextField)popover.ContentViewController.View).AttributedStringValue = attrString; } - void CreatePopoverForLayer (CALayer layer) + bool CreatePopoverForLayer (CALayer layer) { string tooltip = layerToStatus [layer.Name].ToolTip; if (tooltip == null) - return; + return false; CreatePopoverCommon (230, tooltip); + return true; } void CreatePopoverForStatusBar () @@ -727,7 +728,9 @@ namespace MonoDevelop.MacIntegration.MainToolbar if (!layerToStatus.ContainsKey (layer.Name)) return; - CreatePopoverForLayer (layer); + if (!CreatePopoverForLayer (layer)) + return; + popover.Show (layer.Frame, this, NSRectEdge.MinYEdge); } |