Browse Source

fixed SD2-1568 - Using unsupported evaluation features in conditional breakpoints causes an exception

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@4927 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Siegfried Pammer 16 years ago
parent
commit
4d195d078b
  1. 6
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/EvaluateAstVisitor.cs
  2. 4
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs

6
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Expressions/EvaluateAstVisitor.cs

@ -189,8 +189,10 @@ namespace Debugger.AddIn @@ -189,8 +189,10 @@ namespace Debugger.AddIn
default:
throw new NotImplementedException("BinaryOperator: " + binaryOperatorExpression.Op);
}
} catch (System.Exception e) {
throw new GetValueException(e.Message);
} catch (NotImplementedException e) {
throw e;
} catch (System.Exception e2) {
throw new GetValueException(e2.Message);
}
return val;

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

@ -565,7 +565,9 @@ namespace ICSharpCode.SharpDevelop.Services @@ -565,7 +565,9 @@ namespace ICSharpCode.SharpDevelop.Services
else
return false;
} catch (GetValueException e) {
WorkbenchSingleton.SafeThreadAsyncCall(MessageService.ShowError, e);
string errorMessage = "Error while evaluating breakpoint condition " + code + ":\n" + e.Message + "\n";
DebuggerService.PrintDebugMessage(errorMessage);
WorkbenchSingleton.SafeThreadAsyncCall(MessageService.ShowWarning, errorMessage);
return true;
}
}

Loading…
Cancel
Save