a slight hack to fix Tastudio when loading a different rom while it is open

This commit is contained in:
adelikat 2020-07-19 15:09:26 -05:00
parent ffd255bb8e
commit 1162e89675
2 changed files with 8 additions and 1 deletions

View File

@ -26,7 +26,10 @@ namespace BizHawk.Client.EmuHawk
return false;
}
RebootCore();
if (!_isLoadingRom)
{
RebootCore();
}
Config.RecentMovies.Add(movie.Filename);

View File

@ -3465,6 +3465,7 @@ namespace BizHawk.Client.EmuHawk
}
private LoadRomArgs _currentLoadRomArgs;
private bool _isLoadingRom;
public bool LoadRom(string path, LoadRomArgs args)
{
@ -3489,6 +3490,7 @@ namespace BizHawk.Client.EmuHawk
if (args == null)
throw new ArgumentNullException(nameof(args));
_isLoadingRom = true;
path = EmuHawkUtil.ResolveShortcut(path);
// if this is the first call to LoadRom (they will come in recursively) then stash the args
@ -3752,6 +3754,8 @@ namespace BizHawk.Client.EmuHawk
{
_currentLoadRomArgs = null;
}
_isLoadingRom = false;
}
}