From 96885ce14634a01f5b548a6ce4d8b99da5e98e80 Mon Sep 17 00:00:00 2001 From: Morilli <35152647+Morilli@users.noreply.github.com> Date: Mon, 17 Mar 2025 20:47:44 +0100 Subject: [PATCH] cleanup RecordMovie.MakePath this now allows creating tasproj files as originally intended but that will probably crash immediately because good coding --- .../movie/RecordMovie.cs | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs index 7b685a675d..ec75f93ba7 100644 --- a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs +++ b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs @@ -183,20 +183,14 @@ namespace BizHawk.Client.EmuHawk if (!string.IsNullOrWhiteSpace(path)) { - if (path.LastIndexOf(Path.DirectorySeparatorChar) == -1) + path = Path.IsPathRooted(path) + ? Path.GetFullPath(path) + : Path.Combine(_config.PathEntries.MovieAbsolutePath(), path); + + if (!MovieService.MovieExtensions.Select(static ext => $".{ext}").Contains(Path.GetExtension(path))) { - if (path[0] != Path.DirectorySeparatorChar) - { - path = path.Insert(0, Path.DirectorySeparatorChar.ToString()); - } - - path = _config.PathEntries.MovieAbsolutePath() + path; - - if (!MovieService.MovieExtensions.Contains(Path.GetExtension(path))) - { - // If no valid movie extension, add movie extension - path += $".{MovieService.StandardMovieExtension}"; - } + // If no valid movie extension, add movie extension + path += $".{MovieService.StandardMovieExtension}"; } }