Browse Source

Fix NullReferenceException in Process.GetCurrentExecutingFrame

pull/6/merge
Daniel Grunwald 14 years ago
parent
commit
2d0d4433f0
  1. 2
      src/AddIns/Debugger/Debugger.AddIn/Pads/LocalVarPad.cs
  2. 3
      src/AddIns/Debugger/Debugger.Core/Process.cs

2
src/AddIns/Debugger/Debugger.AddIn/Pads/LocalVarPad.cs

@ -66,9 +66,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -66,9 +66,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
LoggingService.Info("Local Variables refresh");
try {
StackFrame frame = debuggedProcess.GetCurrentExecutingFrame();
localVarList.WatchItems.Clear();
if (frame == null) return;
localVarList.WatchItems.Clear();
debuggedProcess.EnqueueForEach(
Dispatcher.CurrentDispatcher,
new StackFrameNode(frame).ChildNodes.ToList(),

3
src/AddIns/Debugger/Debugger.Core/Process.cs

@ -711,6 +711,9 @@ namespace Debugger @@ -711,6 +711,9 @@ namespace Debugger
public StackFrame GetCurrentExecutingFrame()
{
if (IsRunning || SelectedThread == null)
return null;
if (IsSelectedFrameForced()) {
return SelectedStackFrame; // selected from callstack or threads pads
}

Loading…
Cancel
Save