diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 91424c0ec4..c168e3c196 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -1942,14 +1942,18 @@ namespace BizHawk.Client.EmuHawk } else { - MessageBox.Show( + 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.", "No sync settings found", MessageBoxButtons.OK, MessageBoxIcon.Warning ); - - e.Settings = Global.Config.GetCoreSyncSettings(e.Core); + } } } else