From a0dd2e13141e51ba7c384a70df048a79fd26d782 Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Mon, 23 Dec 2019 19:41:20 +0300
Subject: [PATCH] mame: better load error text

---
 BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs b/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
index 7e57405914..a0797ea646 100644
--- a/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
+++ b/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
@@ -41,7 +41,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
 			if (_loadFailure != "")
 			{
 				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"))
 			{
-				MAMEStartupComplete.Set();
 				_loadFailure = data;
 			}
 
+			if (data.Contains("Fatal error"))
+			{
+				MAMEStartupComplete.Set();
+				_loadFailure += data;
+			}
+
 			// mame sends osd_output_channel casted to int, we implicitly cast it back
 			if (!data.Contains("pause = "))
 			{