From c9f2dc1069aa85b4f0eaabe444d2dc5006f1e4de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20Zgodzi=C5=84ski?= <bivaro@gmail.com>
Date: Sun, 17 Apr 2011 18:10:17 +0200
Subject: [PATCH] Minor ContextMenu displaying problems fixed.

---
 ILSpy/ContextMenuEntry.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ILSpy/ContextMenuEntry.cs b/ILSpy/ContextMenuEntry.cs
index ba86b487d..1b50ab88a 100644
--- a/ILSpy/ContextMenuEntry.cs
+++ b/ILSpy/ContextMenuEntry.cs
@@ -65,7 +65,9 @@ namespace ICSharpCode.ILSpy
 		{
 			var provider = new ContextMenuProvider(treeView);
 			treeView.ContextMenuOpening += provider.treeView_ContextMenuOpening;
-			treeView.ContextMenuClosing -= provider.treeView_ContextMenuClosing;
+			// Context menu is shown only when the ContextMenu property is not null before the
+			// ContextMenuOpening event handler is called.
+			treeView.ContextMenu = new ContextMenu();
 		}
 		
 		readonly SharpTreeView treeView;
@@ -114,11 +116,9 @@ namespace ICSharpCode.ILSpy
 			}
 			if (menu.Items.Count > 0)
 				treeView.ContextMenu = menu;
-		}
-		
-		void treeView_ContextMenuClosing(object sender, ContextMenuEventArgs e)
-		{
-			treeView.ContextMenu = null;
+			else
+				// hide the context menu.
+				e.Handled = true;
 		}
 	}
 }