From bf6f6a54d0d8376921d150b0cf7c10778d5bf393 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 22 May 2020 11:52:56 -0500 Subject: [PATCH] When loading a movie - account for a missing core header entry, fallback to the user's preferred core but give them a pop up warning about it --- src/BizHawk.Client.Common/movie/MovieSession.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Client.Common/movie/MovieSession.cs b/src/BizHawk.Client.Common/movie/MovieSession.cs index 1d025f8063..c22fcfe9ea 100644 --- a/src/BizHawk.Client.Common/movie/MovieSession.cs +++ b/src/BizHawk.Client.Common/movie/MovieSession.cs @@ -263,8 +263,18 @@ namespace BizHawk.Client.Common if (Global.Config.PreferredCores.ContainsKey(preference)) { + string movieCore = Global.Config.PreferredCores[preference]; + if (string.IsNullOrWhiteSpace(movie.Core)) + { + PopupMessage($"No core specified in the movie file, using the preferred core {Global.Config.PreferredCores[preference]} instead."); + } + else + { + movieCore = movie.Core; + } + _preferredCores[preference] = Global.Config.PreferredCores[preference]; - Global.Config.PreferredCores[preference] = movie.Core; + Global.Config.PreferredCores[preference] = movieCore; } }