Browse Source

Fixed SD2-1479 - Null exception when running a Python project with the debugger;

Fixed the buttons "Continue" and "Terminate" in the exception dialog

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3676 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 17 years ago
parent
commit
8caabfea65
  1. 4
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs
  2. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebuggerEventForm.cs
  3. 5
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Expression.cs

4
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs

@ -52,9 +52,7 @@ using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.Services namespace ICSharpCode.SharpDevelop.Services
{ {
internal sealed partial class DebugeeExceptionForm internal sealed partial class DebugeeExceptionForm
{ {
private Result result = Result.Break; // Default
private DebugeeExceptionForm() private DebugeeExceptionForm()
{ {
InitializeComponent(); InitializeComponent();

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebuggerEventForm.cs

@ -48,7 +48,7 @@ namespace ICSharpCode.SharpDevelop.Services
{ {
public enum Result {Break, Continue, Terminate}; public enum Result {Break, Continue, Terminate};
private Result result = Result.Break; // Default protected Result result = Result.Break; // Default
protected DebuggerEventForm() protected DebuggerEventForm()
{ {

5
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Expressions/Expression.cs

@ -64,8 +64,11 @@ namespace Debugger.Expressions
{ {
if (context.SelectedStackFrame != null) { if (context.SelectedStackFrame != null) {
return Evaluate(context.SelectedStackFrame); return Evaluate(context.SelectedStackFrame);
} else { } else if (context.SelectedThread.MostRecentStackFrame != null ) {
return Evaluate(context.SelectedThread.MostRecentStackFrame); return Evaluate(context.SelectedThread.MostRecentStackFrame);
} else {
// This can happen when needed 'dll' is missing. This causes an exception dialog to be shown even before the applicaiton starts
throw new GetValueException("Can not evaluate because the process has no managed stack frames");
} }
} }

Loading…
Cancel
Save