Browse Source

Fixed function switching bug, debugger window acivated if debugee pauses

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@261 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 21 years ago
parent
commit
6ed9b4fa03
  1. 1
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
  2. 4
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NDebugger-StateControl.cs
  3. 2
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs
  4. 2
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs
  5. 2
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs

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

@ -394,6 +394,7 @@ namespace ICSharpCode.SharpDevelop.Services
public void JumpToCurrentLine() public void JumpToCurrentLine()
{ {
WorkbenchSingleton.MainForm.Activate();
SourcecodeSegment nextStatement = debugger.NextStatement; SourcecodeSegment nextStatement = debugger.NextStatement;
if (nextStatement == null) { if (nextStatement == null) {
DebuggerService.RemoveCurrentLineMarker(); DebuggerService.RemoveCurrentLineMarker();

4
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NDebugger-StateControl.cs

@ -121,13 +121,13 @@ namespace DebuggerLibrary
OnDebuggingPaused(reason); OnDebuggingPaused(reason);
} }
internal void FakePause(PausedReason reason) internal void FakePause(PausedReason reason, bool keepCurrentFunction)
{ {
Process process = CurrentProcess; Process process = CurrentProcess;
Thread thread = CurrentThread; Thread thread = CurrentThread;
Function function = CurrentFunction; Function function = CurrentFunction;
Resume(); Resume();
Pause(reason, process, thread, function); Pause(reason, process, thread, keepCurrentFunction ? function : null);
} }
internal void Resume() internal void Resume()

2
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs

@ -335,7 +335,7 @@ namespace DebuggerLibrary
corILFrame.CanSetIP((uint)ilOffset); corILFrame.CanSetIP((uint)ilOffset);
} else { } else {
corILFrame.SetIP((uint)ilOffset); corILFrame.SetIP((uint)ilOffset);
debugger.FakePause(PausedReason.SetIP); debugger.FakePause(PausedReason.SetIP, false);
} }
} catch { } catch {
return null; return null;

2
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs

@ -49,7 +49,7 @@ namespace DebuggerLibrary
{ {
CurrentThread = thread; CurrentThread = thread;
debugger.FakePause(PausedReason.CurrentThreadChanged); debugger.FakePause(PausedReason.CurrentThreadChanged, false);
} }
public IList<Thread> Threads { public IList<Thread> Threads {

2
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs

@ -252,7 +252,7 @@ namespace DebuggerLibrary
{ {
CurrentFunction = function; CurrentFunction = function;
debugger.FakePause(PausedReason.CurrentFunctionChanged); debugger.FakePause(PausedReason.CurrentFunctionChanged, true);
} }
public Function LastFunctionWithLoadedSymbols { public Function LastFunctionWithLoadedSymbols {

Loading…
Cancel
Save