ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't show file picker twice on fallback to different core

This commit is contained in:
goyuken 2014-12-22 22:21:51 +00:00
parent 6f195ba0d8
commit 401c40fe8a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.Client.Common/RomLoader.cs
View File

@ -124,11 +124,17 @@ namespace BizHawk.Client.Common
public Func<RomGame, string> ChoosePlatform { get; set; }
// in case we get sent back through the picker more than once, use the same choice the second time
int? previouschoice;
private int? HandleArchive(HawkFile file)
{
if (previouschoice.HasValue)
return previouschoice;
if (ChooseArchive != null)
{
return ChooseArchive(file);
previouschoice = ChooseArchive(file);
return previouschoice;
}
return null;
@ -184,7 +190,7 @@ namespace BizHawk.Client.Common
// if we have an archive and need to bind something, then pop the dialog
if (file.IsArchive && !file.IsBound)
{
var result = HandleArchive(file);
int? result = HandleArchive(file);
if (result.HasValue)
{
file.BindArchiveMember(result.Value);