[Debugger] Ensure persisted pinned watches display after IDE restart

1 files changed, 4 insertions, 2 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/PinnedWatches/PinnedWatchAdornmentManager.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/PinnedWatches/PinnedWatchAdornmentManager.cs
index 1789894109..27feca882b 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/PinnedWatches/PinnedWatchAdornmentManager.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/PinnedWatches/PinnedWatchAdornmentManager.cs
@@ -137,7 +137,7 @@ namespace MonoDevelop.Debugger.VSTextView.PinnedWatches
 		{
 			try {
 				if (!textView.TextViewLines.IntersectsBufferSpan (span)) {
-					layer.RemoveAdornmentsByTag (watch);
+					layer.RemoveAdornment (view);
 					return;
 				}
 
@@ -147,8 +147,10 @@ namespace MonoDevelop.Debugger.VSTextView.PinnedWatches
 					Math.Round (charBound.TextTop + charBound.TextHeight / 2 - view.Frame.Height / 2));
 				view.SetFrameOrigin (origin);
 
-				if (view.Superview == null)
+				if (view.Superview == null || view.VisibleRect () == CGRect.Empty) {
+					layer.RemoveAdornment (view);
 					layer.AddAdornment (XPlatAdornmentPositioningBehavior.TextRelative, span, watch, view, null);
+				}
 			} catch (Exception ex) {
 				view.SetFrameOrigin (default);
 				LoggingService.LogInternalError ("https://vsmac.dev/923058", ex);