From 7f7d7ab1b34e62e756015bd7a143a64cd8188b87 Mon Sep 17 00:00:00 2001 From: Sour Date: Sat, 9 Jun 2018 18:02:49 -0400 Subject: [PATCH] Linux: Fixed rare crashes when opening debugger (when loading a DBG file) --- GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs | 2 +- GUI.NET/Debugger/frmDebugger.cs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs b/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs index 0bc8d097..248b5251 100644 --- a/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs +++ b/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs @@ -498,7 +498,7 @@ namespace Mesen.GUI.Debugger public string GetLineComment(int lineNumber) { - if(_code.SymbolProvider != null && _code._config.ShowSourceAsComments) { + if(_code.SymbolProvider != null && _code._config?.ShowSourceAsComments == true) { AddressTypeInfo addressInfo = _code.GetAddressInfo(lineNumber); if(addressInfo.Type == AddressType.PrgRom) { return _code.SymbolProvider.GetSourceCodeLine(addressInfo.Address); diff --git a/GUI.NET/Debugger/frmDebugger.cs b/GUI.NET/Debugger/frmDebugger.cs index c4e0b933..cf2c3f9d 100644 --- a/GUI.NET/Debugger/frmDebugger.cs +++ b/GUI.NET/Debugger/frmDebugger.cs @@ -178,6 +178,11 @@ namespace Mesen.GUI.Debugger { base.OnShown(e); + ctrlDebuggerCode.Visible = true; + ctrlDebuggerCodeSplit.Visible = true; + ctrlSourceViewer.Visible = true; + ctrlSourceViewerSplit.Visible = true; + ctrlDebuggerCode.CodeViewerActions.OnSetNextStatement += ctrlDebuggerCode_OnSetNextStatement; ctrlDebuggerCode.CodeViewerActions.OnShowInSplitView += ctrlDebuggerCode_OnShowInSplitView; ctrlDebuggerCode.CodeViewerActions.OnSwitchView += ctrlDebuggerCode_OnSwitchView; @@ -186,9 +191,6 @@ namespace Mesen.GUI.Debugger ctrlDebuggerCodeSplit.CodeViewerActions.OnShowInSplitView += ctrlDebuggerCode_OnShowInSplitView; ctrlDebuggerCodeSplit.CodeViewerActions.OnSwitchView += ctrlDebuggerCode_OnSwitchView; - ctrlSourceViewer.Visible = true; - ctrlSourceViewerSplit.Visible = true; - ctrlSourceViewer.CodeViewerActions.OnSetNextStatement += ctrlDebuggerCode_OnSetNextStatement; ctrlSourceViewer.CodeViewerActions.OnShowInSplitView += ctrlDebuggerCode_OnShowInSplitView; ctrlSourceViewer.CodeViewerActions.OnSwitchView += ctrlDebuggerCode_OnSwitchView;