From 97e030fcb893b130a99782a92a30bff52bf027b4 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 14 Oct 2021 14:45:00 +1000 Subject: [PATCH] Add confirmation modal when launching TAStudio during casual play --- src/BizHawk.Client.EmuHawk/MainForm.Events.cs | 7 ++++++- src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs index e2f413313c..ff63e76faf 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1242,7 +1242,12 @@ namespace BizHawk.Client.EmuHawk ShowMessageBox(owner: null, "Current core does not support input polling. TAStudio can't be used."); return; } - + const int DONT_PROMPT_BEFORE_FRAME = 2 * 60 * 60; // 2 min @ 60 fps + if (!MovieSession.Movie.IsActive() && Emulator.Frame > DONT_PROMPT_BEFORE_FRAME // if playing casually (not recording) AND played for enough frames (prompting always would be annoying)... + && !this.ModalMessageBox2("This will reload the rom without saving. Launch TAStudio anyway?", "Confirmation")) // ...AND user responds "No" to "Open TAStudio?", then cancel + { + return; + } Tools.Load(); } diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index b545e45689..8a931b419c 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -346,7 +346,7 @@ namespace BizHawk.Client.EmuHawk break; case "TAStudio": - Tools.Load(); + TAStudioMenuItem_Click(null, null); break; case "ToolBox": Tools.Load();