From bbe704055487f6aa10a44231a278f5faa0be53b6 Mon Sep 17 00:00:00 2001 From: James Groom Date: Wed, 20 Mar 2024 19:33:46 +0000 Subject: [PATCH] Remove temporary no-crash-plz shims --- src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs | 1 - src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs | 2 -- src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs | 2 -- src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 1 - 4 files changed, 6 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index a4d06c5a03..2f25f0ba90 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -162,7 +162,6 @@ namespace BizHawk.Client.EmuHawk private void Cheats_Load(object sender, EventArgs e) { - if (Settings.Columns.Exists(static c => string.IsNullOrWhiteSpace(c.Text))) Settings = new(); //HACK for previous config settings CheatEditor.MemoryDomains = Core; LoadConfigSettings(); CheatsMenu.Items.Add(CheatListView.ToColumnsMenu(ColumnToggleCallback)); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index 32833562a0..90d85ed3b9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -160,8 +160,6 @@ namespace BizHawk.Client.EmuHawk private void LuaConsole_Load(object sender, EventArgs e) { - if (Settings.Columns.Exists(static c => c.Text is null)) Settings = new(); //HACK for previous config settings - if (Config.RecentLuaSession.AutoLoad && !Config.RecentLuaSession.Empty) { LoadSessionFromRecent(Config.RecentLuaSession.MostRecent); diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 9dbd06d11c..1fa0e95583 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -139,8 +139,6 @@ namespace BizHawk.Client.EmuHawk private void RamSearch_Load(object sender, EventArgs e) { - if (Settings.Columns.Exists(static c => string.IsNullOrWhiteSpace(c.Text))) Settings = new(); //HACK for previous config settings - RamSearchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback)); _settings = new SearchEngineSettings(MemoryDomains, Settings.UseUndoHistory); diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index fdbe531156..77bc242d7b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -1089,7 +1089,6 @@ namespace BizHawk.Client.EmuHawk private void RamWatch_Load(object sender, EventArgs e) { - if (Settings.Columns.Exists(static c => string.IsNullOrWhiteSpace(c.Text))) Settings = new(); //HACK for previous config settings _watches = new WatchList(MemoryDomains, Emu.SystemId); LoadConfigSettings(); RamWatchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback));