From 64c646931cfc7752276de670e5e4f746e85fc061 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sun, 14 Nov 2010 18:30:28 +0100
Subject: [PATCH] Fixed ArgumentNullException when
 currentDebugger.GetTooltipControl() returns null.

---
 .../Base/Project/Src/Services/Debugger/DebuggerService.cs   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
index a394e930c2..631f514ff8 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
@@ -271,7 +271,11 @@ namespace ICSharpCode.SharpDevelop.Debugging
 				}
 				if (toolTipText != null) {
 					if (debuggerCanShowValue && currentDebugger != null) {
-						e.SetToolTip(currentDebugger.GetTooltipControl(expressionResult.Expression));
+						object toolTip = currentDebugger.GetTooltipControl(expressionResult.Expression);
+						if (toolTip != null)
+							e.SetToolTip(toolTip);
+						else
+							e.SetToolTip(toolTipText);
 					} else {
 						e.SetToolTip(toolTipText);
 					}