From 7baff720074c972bd60b0568675b241ede856028 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Sat, 19 Apr 2014 11:03:11 +0200
Subject: [PATCH] fix #436 - Debugger always steps into external code I've
 restored the "Use 'Just My Code' feature for stepping" option

---
 .../Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.xaml  | 2 ++
 src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.xaml b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.xaml
index 06b62a35e2..9a6b7c713c 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.xaml
+++ b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.xaml
@@ -36,6 +36,8 @@
 		</GroupBox>
 		<GroupBox Margin="5" Header="{sd:Localize Dialog.Options.IDEOptions.Debugging.WithoutSource}">
 			<widgets:StackPanelWithSpacing SpaceBetweenItems="5">
+				<CheckBox Content="{sd:Localize Dialog.Options.IDEOptions.Debugging.Stepping.EnableJustMyCode}"
+				          IsChecked="{sd:OptionBinding debugger:DebuggingOptions.EnableJustMyCode}" />
 				<CheckBox Content="{sd:Localize Dialog.Options.IDEOptions.Debugging.AskForArguments}"
 				          IsChecked="{sd:OptionBinding debugger:DebuggingOptions.AskForArguments}" />
 				<CheckBox Content="{sd:Localize Dialog.Options.IDEOptions.Debugging.BreakAtBeginning}"
diff --git a/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs b/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs
index 990ccb1a1c..51c6e1eea9 100644
--- a/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs
+++ b/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs
@@ -16,7 +16,7 @@ namespace ICSharpCode.ILSpyAddIn
 	{
 		public bool Handles(IMethod method)
 		{
-			return true;
+			return !SD.Debugger.Options.EnableJustMyCode;
 		}
 		
 		public bool IsCompilerGenerated(IMethod method)