diff options
author | iain holmes <iain@xamarin.com> | 2019-07-09 16:58:20 +0300 |
---|---|---|
committer | monojenkins <jo.shields+jenkins@xamarin.com> | 2019-07-09 17:41:49 +0300 |
commit | b767d46857af3155d98a042156374680c1231b04 (patch) | |
tree | d41b70695eedf838a81aed74c13566eb6328afb2 /main | |
parent | 0c8fb915f4863d6275ba71660e5f95629e1c435f (diff) |
[Mac] Don't reshow the popover when the view has been removed from the window
ViewDidMoveToWindow can be called when removing the view from a parent window,
in which case we should not try to redisplay any popovers
Fixes VSTS #929008
Diffstat (limited to 'main')
-rw-r--r-- | main/src/addins/MacPlatform/MainToolbar/StatusBar.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs index ba3761b28b..14b858c077 100644 --- a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs @@ -700,6 +700,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar public override void ViewDidMoveToWindow () { base.ViewDidMoveToWindow (); + ReconstructString (); RepositionContents (); } @@ -720,7 +721,13 @@ namespace MonoDevelop.MacIntegration.MainToolbar imageView.Image = image; if (updatePopover) { DestroyPopover (null, null); - ShowPopoverForStatusBar (); + + // Window will be null if the StatusBar has been removed from its parent + // In that case we want to destroy the popover, but we don't want to show + // it again + if (Window != null) { + ShowPopoverForStatusBar (); + } } } } |