From c7f438c240eb078919df8c0adc7ba1e35bf8cca6 Mon Sep 17 00:00:00 2001
From: James Groom <OSSYoshiRulz@gmail.com>
Date: Tue, 24 Oct 2023 22:46:22 +1000
Subject: [PATCH] Use loaded movie's filename for A/V filename

---
 src/BizHawk.Client.EmuHawk/MainForm.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 31039e75ec..a24dce150d 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3464,7 +3464,7 @@ namespace BizHawk.Client.EmuHawk
 						var result = this.ShowFileSaveDialog(
 							filter: new(new FilesystemFilter(ext, new[] { ext })),
 							initDir: Config.PathEntries.AvAbsolutePath(),
-							initFileName: $"{Game.FilesystemSafeName()}.{ext}");
+							initFileName: $"{(MovieSession.Movie.IsActive() ? Path.GetFileNameWithoutExtension(MovieSession.Movie.Filename) : Game.FilesystemSafeName())}.{ext}");
 						if (result is null)
 						{
 							aw.Dispose();