when loading a movie via commandline, don't nag about lacking sync settings

This commit is contained in:
adelikat 2015-08-01 11:13:22 -04:00
parent f487a1f937
commit 2e3b27494f
1 changed files with 6 additions and 1 deletions

View File

@ -326,6 +326,7 @@ namespace BizHawk.Client.EmuHawk
if (cmdMovie != null)
{
_supressSyncSettingsWarning = true; // We dont' want to be nagged if we are attempting to automate
if (Global.Game == null)
{
OpenRom();
@ -368,6 +369,8 @@ namespace BizHawk.Client.EmuHawk
StartNewMovie(movie, false);
Global.Config.RecentMovies.Add(cmdMovie);
}
_supressSyncSettingsWarning = false;
}
}
else if (Global.Config.RecentMovies.AutoLoad && !Global.Config.RecentMovies.Empty)
@ -442,6 +445,8 @@ namespace BizHawk.Client.EmuHawk
};
}
private bool _supressSyncSettingsWarning = false;
public void ProgramRunLoop()
{
CheckMessages();
@ -2000,7 +2005,7 @@ namespace BizHawk.Client.EmuHawk
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)
if (e.Settings != null && !_supressSyncSettingsWarning)
{
MessageBox.Show(
"No sync settings found, using currently configured settings for this core.",