diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs index a6adcf76f7..7834fd95ee 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -736,14 +736,17 @@ namespace BizHawk.Client.EmuHawk { Load(); - if (Global.Config.RecentWatches.AutoLoad && !Global.Config.RecentWatches.Empty) + if (IsAvailable()) // Just because we attempted to load it, doesn't mean it was, the current core may not have the correct dependencies { - RamWatch.LoadFileFromRecent(Global.Config.RecentWatches.MostRecent); - } + if (Global.Config.RecentWatches.AutoLoad && !Global.Config.RecentWatches.Empty) + { + RamWatch.LoadFileFromRecent(Global.Config.RecentWatches.MostRecent); + } - if (!loadDialog) - { - Get().Close(); + if (!loadDialog) + { + Get().Close(); + } } }