mame: better load error text

This commit is contained in:
feos 2019-12-23 19:41:20 +03:00
parent cfce96c672
commit a0dd2e1314
1 changed files with 7 additions and 2 deletions

View File

@ -41,7 +41,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
if (_loadFailure != "") if (_loadFailure != "")
{ {
Dispose(); Dispose();
throw new Exception(_loadFailure); throw new Exception("\n\n" + _loadFailure);
} }
} }
@ -563,10 +563,15 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
{ {
if (data.Contains("NOT FOUND")) if (data.Contains("NOT FOUND"))
{ {
MAMEStartupComplete.Set();
_loadFailure = data; _loadFailure = data;
} }
if (data.Contains("Fatal error"))
{
MAMEStartupComplete.Set();
_loadFailure += data;
}
// mame sends osd_output_channel casted to int, we implicitly cast it back // mame sends osd_output_channel casted to int, we implicitly cast it back
if (!data.Contains("pause = ")) if (!data.Contains("pause = "))
{ {