ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automatically switch thread context on suspend

This commit is contained in:
x1nixmzeng 2018-02-05 20:53:12 +00:00
parent fd6625f584
commit 1790461543
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/CxbxDebugger/Form1.cs
View File

@ -111,9 +111,15 @@ namespace CxbxDebugger
} }
} }
private void PopulateThreadList(ComboBox.ObjectCollection Items, DebuggerThread FocusThread) private void PopulateThreadList(ToolStripComboBox cbItems, DebuggerThread FocusThread)
{ {
Items.Clear(); cbItems.Items.Clear();
uint AutoThreadId= DebugThreads[0].OwningProcess.MainThread.ThreadID;
if (FocusThread != null)
AutoThreadId = FocusThread.ThreadID;
int AutoIndex = 0;
foreach (DebuggerThread Thread in DebugThreads) foreach (DebuggerThread Thread in DebugThreads)
{ {
@ -154,8 +160,16 @@ namespace CxbxDebugger
DisplayStr += " (suspended)"; DisplayStr += " (suspended)";
} }
Items.Add(DisplayStr); if (AutoThreadId == Thread.ThreadID)
{
AutoIndex = cbItems.Items.Count;
}
cbItems.Items.Add(DisplayStr);
} }
// Auto-select this thread
cbItems.SelectedIndex = AutoIndex;
} }
private void Form1_FormClosed(object sender, FormClosedEventArgs e) private void Form1_FormClosed(object sender, FormClosedEventArgs e)
@ -429,7 +443,7 @@ namespace CxbxDebugger
frm.DebugLog(ExceptionMessage); frm.DebugLog(ExceptionMessage);
// Already suspended at this point, so we can rebuild the callstack list // Already suspended at this point, so we can rebuild the callstack list
frm.PopulateThreadList(frm.cbThreads.Items, Thread); frm.PopulateThreadList(frm.cbThreads, Thread);
ExceptionMessage += "\n\nAttempt to ignore this and risk crashing the app?"; ExceptionMessage += "\n\nAttempt to ignore this and risk crashing the app?";
@ -499,7 +513,7 @@ namespace CxbxDebugger
DebuggerInst.Break(); DebuggerInst.Break();
NativeWrappers.FlashWindowTray(Handle); NativeWrappers.FlashWindowTray(Handle);
PopulateThreadList(cbThreads.Items, null); PopulateThreadList(cbThreads, null);
} }
lblStatus.Text = string.Format("Suspended ({0})", Reason); lblStatus.Text = string.Format("Suspended ({0})", Reason);
@ -834,6 +848,12 @@ namespace CxbxDebugger
OtherModuleCount = 0; OtherModuleCount = 0;
} }
} }
if(cbFrames.Items.Count > 0 )
{
// Auto-select the first item to dump
cbFrames.SelectedIndex = 0;
}
} }
private void cbThreads_SelectedIndexChanged(object sender, EventArgs e) private void cbThreads_SelectedIndexChanged(object sender, EventArgs e)