Debugger: Fixed UI crash when using debug tools while the loaded rom is inside a zip/7z file

This commit is contained in:
Sour 2019-07-10 22:50:40 -04:00
parent 26bf239cee
commit c6f8ab4276

View file

@ -1,6 +1,7 @@
using Mesen.GUI.Config; using Mesen.GUI.Config;
using Mesen.GUI.Debugger.Integration; using Mesen.GUI.Debugger.Integration;
using Mesen.GUI.Debugger.Labels; using Mesen.GUI.Debugger.Labels;
using Mesen.GUI.Forms;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@ -101,7 +102,7 @@ namespace Mesen.GUI.Debugger.Workspace
if(ConfigManager.Config.Debug.DbgIntegration.AutoImport) { if(ConfigManager.Config.Debug.DbgIntegration.AutoImport) {
RomInfo romInfo = EmuApi.GetRomInfo(); RomInfo romInfo = EmuApi.GetRomInfo();
string dbgPath = Path.Combine(Path.GetDirectoryName(romInfo.RomPath), romInfo.GetRomName() + ".dbg"); string dbgPath = Path.Combine(((ResourcePath)romInfo.RomPath).Folder, romInfo.GetRomName() + ".dbg");
if(File.Exists(dbgPath)) { if(File.Exists(dbgPath)) {
_symbolProvider = new DbgImporter(); _symbolProvider = new DbgImporter();
_symbolProvider.Import(dbgPath, true); _symbolProvider.Import(dbgPath, true);