Don't warn that a movie lacks sync settings if the core itself has no sync settings. Cores like Apple II do not, for instance. Fixes issue #437

This commit is contained in:
adelikat 2015-06-21 00:50:34 +00:00
parent aa75bd52e9
commit 261ae5e323
1 changed files with 7 additions and 3 deletions

View File

@ -1941,6 +1941,11 @@ namespace BizHawk.Client.EmuHawk
e.Settings = ConfigService.LoadWithType(Global.MovieSession.QueuedMovie.SyncSettingsJson);
}
else
{
e.Settings = Global.Config.GetCoreSyncSettings(e.Core);
// adelikat: only show this nag if the core actually has sync settings, not all cores do
if (e.Settings != null)
{
MessageBox.Show(
"No sync settings found, using currently configured settings for this core.",
@ -1948,8 +1953,7 @@ namespace BizHawk.Client.EmuHawk
MessageBoxButtons.OK,
MessageBoxIcon.Warning
);
e.Settings = Global.Config.GetCoreSyncSettings(e.Core);
}
}
}
else