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

Rom Loader - don't call message boxes, use the error callback

This commit is contained in:
adelikat 2015-10-17 19:11:04 -04:00
parent 8f716363a7
commit 75e6216ca2
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/BizHawk.Client.Common.csproj
View File

@ -243,7 +243,6 @@
<Compile Include="tools\RamSearchEngine.cs" /> <Compile Include="tools\RamSearchEngine.cs" />
<Compile Include="tools\Watch.cs" /> <Compile Include="tools\Watch.cs" />
<Compile Include="tools\WatchList.cs" /> <Compile Include="tools\WatchList.cs" />
<Compile Include="UIHelper.cs" />
<Compile Include="XmlGame.cs" /> <Compile Include="XmlGame.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -31,7 +31,7 @@ namespace BizHawk.Client.Common
{ {
public class RomLoader public class RomLoader
{ {
public enum LoadErrorType { Unknown, MissingFirmware, XML } public enum LoadErrorType { Unknown, MissingFirmware, XML, DiscError }
// helper methods for the settings events // helper methods for the settings events
private object GetCoreSettings<T>() private object GetCoreSettings<T>()
@ -265,7 +265,7 @@ namespace BizHawk.Client.Common
if (discMountJob.OUT_SlowLoadAborted) if (discMountJob.OUT_SlowLoadAborted)
{ {
System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk"); DoLoadErrorCallback("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk", "", LoadErrorType.DiscError);
return false; return false;
} }
@ -324,7 +324,7 @@ namespace BizHawk.Client.Common
if (discMountJob.OUT_SlowLoadAborted) if (discMountJob.OUT_SlowLoadAborted)
{ {
System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk"); DoLoadErrorCallback("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk", "", LoadErrorType.DiscError);
return false; return false;
} }
@ -460,7 +460,7 @@ namespace BizHawk.Client.Common
if (discMountJob.OUT_SlowLoadAborted) if (discMountJob.OUT_SlowLoadAborted)
{ {
System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk"); DoLoadErrorCallback("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk", "PSX", LoadErrorType.DiscError);
return false; return false;
} }
@ -515,7 +515,7 @@ namespace BizHawk.Client.Common
{ {
// need to get rid of this hack at some point // need to get rid of this hack at some point
rom = new RomGame(file); rom = new RomGame(file);
((CoreFileProvider)nextComm.CoreFileProvider).SubfileDirectory = Path.GetDirectoryName(path.Replace("|", String.Empty)); // Dirty hack to get around archive filenames (since we are just getting the directory path, it is safe to mangle the filename ((CoreFileProvider)nextComm.CoreFileProvider).SubfileDirectory = Path.GetDirectoryName(path.Replace("|", string.Empty)); // Dirty hack to get around archive filenames (since we are just getting the directory path, it is safe to mangle the filename
byte[] romData = null; byte[] romData = null;
byte[] xmlData = rom.FileData; byte[] xmlData = rom.FileData;