diff --git a/src/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs b/src/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs index b46eb47c93..c527e210c6 100644 --- a/src/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs +++ b/src/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs @@ -106,11 +106,6 @@ namespace BizHawk.Client.Common.RamSearchEngine Compare.Difference => CompareDifference(_watchList).ToArray(), _ => ComparePrevious(_watchList).ToArray() }; - - if (_settings.PreviousType == PreviousType.LastSearch) - { - SetPreviousToCurrent(); - } } if (UndoEnabled) diff --git a/src/BizHawk.Client.Common/tools/RamSearchEngine/SearchEngineSettings.cs b/src/BizHawk.Client.Common/tools/RamSearchEngine/SearchEngineSettings.cs index 5323c745f7..2c1ddde3c4 100644 --- a/src/BizHawk.Client.Common/tools/RamSearchEngine/SearchEngineSettings.cs +++ b/src/BizHawk.Client.Common/tools/RamSearchEngine/SearchEngineSettings.cs @@ -15,7 +15,7 @@ namespace BizHawk.Client.Common.RamSearchEngine Domain = memoryDomains.MainMemory; CheckMisAligned = false; - PreviousType = PreviousType.LastSearch; + PreviousType = PreviousType.LastFrame; UseUndoHistory = useUndoHistory; } diff --git a/src/BizHawk.Client.Common/tools/Watch/PreviousType.cs b/src/BizHawk.Client.Common/tools/Watch/PreviousType.cs index 4d8442ff2e..6f08ebd199 100644 --- a/src/BizHawk.Client.Common/tools/Watch/PreviousType.cs +++ b/src/BizHawk.Client.Common/tools/Watch/PreviousType.cs @@ -3,7 +3,6 @@ public enum PreviousType { Original = 0, - LastSearch = 1, LastFrame = 2, LastChange = 3, } diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs index 3d73887741..d09fbdf897 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs @@ -72,7 +72,6 @@ namespace BizHawk.Client.EmuHawk this.DisplayTypeSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.DefinePreviousValueSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.Previous_LastSearchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.PreviousFrameMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.Previous_OriginalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.Previous_LastChangeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -401,18 +400,12 @@ namespace BizHawk.Client.EmuHawk // DefinePreviousValueSubMenu // this.DefinePreviousValueSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.Previous_LastSearchMenuItem, this.PreviousFrameMenuItem, this.Previous_OriginalMenuItem, this.Previous_LastChangeMenuItem}); this.DefinePreviousValueSubMenu.Text = "Define Previous Value"; this.DefinePreviousValueSubMenu.DropDownOpened += new System.EventHandler(this.DefinePreviousValueSubMenu_DropDownOpened); // - // Previous_LastSearchMenuItem - // - this.Previous_LastSearchMenuItem.Text = "Last &Search"; - this.Previous_LastSearchMenuItem.Click += new System.EventHandler(this.Previous_LastSearchMenuItem_Click); - // // PreviousFrameMenuItem // this.PreviousFrameMenuItem.Text = "&Previous Frame"; @@ -1137,7 +1130,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator8; private BizHawk.WinForms.Controls.ToolStripMenuItemEx DefinePreviousValueSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx PreviousFrameMenuItem; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx Previous_LastSearchMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx Previous_OriginalMenuItem; private System.Windows.Forms.GroupBox CompareToBox; private System.Windows.Forms.RadioButton DifferenceRadio; diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 369e4828d9..bd7edbd18d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -784,11 +784,6 @@ namespace BizHawk.Client.EmuHawk _settings.Mode = SearchMode.Fast; _searches.SetMode(SearchMode.Fast); - if (_settings.PreviousType == PreviousType.LastFrame || _settings.PreviousType == PreviousType.LastChange) - { - SetPreviousType(PreviousType.LastSearch); - } - NumberOfChangesRadio.Enabled = false; NumberOfChangesBox.Enabled = false; NumberOfChangesBox.Text = ""; @@ -1084,7 +1079,6 @@ namespace BizHawk.Client.EmuHawk private void DefinePreviousValueSubMenu_DropDownOpened(object sender, EventArgs e) { - Previous_LastSearchMenuItem.Checked = false; PreviousFrameMenuItem.Checked = false; Previous_OriginalMenuItem.Checked = false; Previous_LastChangeMenuItem.Checked = false; @@ -1092,9 +1086,6 @@ namespace BizHawk.Client.EmuHawk switch (_settings.PreviousType) { default: - case PreviousType.LastSearch: - Previous_LastSearchMenuItem.Checked = true; - break; case PreviousType.LastFrame: PreviousFrameMenuItem.Checked = true; break; @@ -1143,11 +1134,6 @@ namespace BizHawk.Client.EmuHawk SetPreviousType(PreviousType.LastFrame); } - private void Previous_LastSearchMenuItem_Click(object sender, EventArgs e) - { - SetPreviousType(PreviousType.LastSearch); - } - private void Previous_OriginalMenuItem_Click(object sender, EventArgs e) { SetPreviousType(PreviousType.Original);