MD part of https://devdiv.visualstudio.com/DevDiv/_workitems/edit/802376

Main thing is in GTK fix, this change just closes it as soon as QuickInfo is requested so it closes also if debugger doesn't have new tooltip to show

1 files changed, 2 insertions, 1 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/QuickInfo/DebuggerQuickInfoSource.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/QuickInfo/DebuggerQuickInfoSource.cs
index 9313ddf0cd..d490f25922 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/QuickInfo/DebuggerQuickInfoSource.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/QuickInfo/DebuggerQuickInfoSource.cs
@@ -78,6 +78,8 @@ namespace MonoDevelop.Debugger.VSTextView.QuickInfo
 		{
 			if (DebuggingService.CurrentFrame == null)
 				return null;
+			if (window != null)
+				await Runtime.RunInMainThread (DestroyWindow);
 			var view = session.TextView;
 
 			var textViewLines = view.TextViewLines;
@@ -113,7 +115,6 @@ namespace MonoDevelop.Debugger.VSTextView.QuickInfo
 				// and do our own thing, notice VS does same thing
 				await session.DismissAsync ();
 				await provider.joinableTaskContext.Factory.SwitchToMainThreadAsync ();
-				DestroyWindow ();
 				this.lastView = view;
 				val.Name = debugInfo.Text;
 				window = new DebugValueWindow ((Gtk.Window)gtkParent.Toplevel, textDocument?.FilePath, textBuffer.CurrentSnapshot.GetLineNumberFromPosition (debugInfo.Span.GetStartPoint (textBuffer.CurrentSnapshot)), DebuggingService.CurrentFrame, val, null);