Prevent esc key propagation in Visualizer dialog

Stop the escape key closing both the Value Visualizer dialog and the
Exception caught dialog

Fixes VSTS #648194

1 files changed, 15 insertions, 0 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Visualizer/ValueVisualizerDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Visualizer/ValueVisualizerDialog.cs
index 37d36b59ed..a173f6220c 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Visualizer/ValueVisualizerDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Visualizer/ValueVisualizerDialog.cs
@@ -29,6 +29,7 @@ using System.Linq;
 using System.Collections.Generic;
 using Mono.Debugging.Client;
 using Gtk;
+using Gdk;
 
 namespace MonoDevelop.Debugger.Viewers
 {
@@ -78,6 +79,20 @@ namespace MonoDevelop.Debugger.Viewers
 			}
 		}
 
+		protected override bool OnKeyPressEvent (EventKey evnt)
+		{
+			if (evnt.Key == Gdk.Key.Escape) {
+				GLib.Timeout.Add (100, delegate {
+					this.Destroy ();
+					return false;
+				});
+
+				// Prevent the escape key from propagating down to the ExceptionCaughtDialog
+				return false;
+			}
+			return base.OnKeyPressEvent (evnt);
+		}
+
 		protected virtual void OnComboVisualizersChanged (object sender, EventArgs e)
 		{
 			var button = (ToggleButton)sender;