Emulation/Mesen
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen.git synced 2025-04-02 10:52:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Linux: Fixed crash when closing debugger while other debugger tools are opened

Browse source
This commit is contained in:
Souryo 2017-08-06 16:39:14 -04:00
parent 0fe8ac8b48
commit a9772efbc4
1 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
GUI.NET/Debugger/frmDebugger.cs
View file

@ -541,34 +541,41 @@ namespace Mesen.GUI.Debugger
this.Close();
}
protected override void OnFormClosed(FormClosedEventArgs e)
protected override void OnFormClosing(FormClosingEventArgs e)
{
tmrCdlRatios.Stop();
foreach(Form frm in this._childForms.ToArray()) {
frm.Close();
if(_childForms.Count > 0) {
foreach(Form frm in this._childForms.ToArray()) {
frm.Close();
}
e.Cancel = true;
this.BeginInvoke((Action)(() => {
this.Close();
}));
} else {
tmrCdlRatios.Stop();
LabelManager.OnLabelUpdated -= LabelManager_OnLabelUpdated;
BreakpointManager.BreakpointsChanged -= BreakpointManager_BreakpointsChanged;
ctrlConsoleStatus.OnStateChanged -= ctrlConsoleStatus_OnStateChanged;
ctrlProfiler.OnFunctionSelected -= ctrlProfiler_OnFunctionSelected;
if(_notifListener != null) {
_notifListener.Dispose();
_notifListener = null;
}
InteropEmu.DebugRelease();
ConfigManager.Config.DebugInfo.WindowWidth = this.WindowState == FormWindowState.Maximized ? this.RestoreBounds.Width : this.Width;
ConfigManager.Config.DebugInfo.WindowHeight = this.WindowState == FormWindowState.Maximized ? this.RestoreBounds.Height : this.Height;
ConfigManager.Config.DebugInfo.TopPanelHeight = this.splitContainer.GetSplitterDistance();
ConfigManager.Config.DebugInfo.LeftPanelWidth = this.ctrlSplitContainerTop.GetSplitterDistance();
ConfigManager.ApplyChanges();
SaveWorkspace();
}
LabelManager.OnLabelUpdated -= LabelManager_OnLabelUpdated;
BreakpointManager.BreakpointsChanged -= BreakpointManager_BreakpointsChanged;
ctrlConsoleStatus.OnStateChanged -= ctrlConsoleStatus_OnStateChanged;
ctrlProfiler.OnFunctionSelected -= ctrlProfiler_OnFunctionSelected;
if(_notifListener != null) {
_notifListener.Dispose();
_notifListener = null;
}
InteropEmu.DebugRelease();
ConfigManager.Config.DebugInfo.WindowWidth = this.WindowState == FormWindowState.Maximized ? this.RestoreBounds.Width : this.Width;
ConfigManager.Config.DebugInfo.WindowHeight = this.WindowState == FormWindowState.Maximized ? this.RestoreBounds.Height : this.Height;
ConfigManager.Config.DebugInfo.TopPanelHeight = this.splitContainer.GetSplitterDistance();
ConfigManager.Config.DebugInfo.LeftPanelWidth = this.ctrlSplitContainerTop.GetSplitterDistance();
ConfigManager.ApplyChanges();
SaveWorkspace();
base.OnFormClosed(e);
base.OnFormClosing(e);
}
private void mnuNametableViewer_Click(object sender, EventArgs e)