From 2059558771355557c01eef1d729cd5abb216f660 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Thu, 15 Dec 2016 13:09:52 -0600
Subject: [PATCH] Lua - fix emu.getdisplaytype() that has been broken for a
 long time, also fix it to properly use the IEmulatorService system instead of
 reflection shenanigans

---
 BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs
index 40430ffee2..6d6e227483 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs
@@ -34,6 +34,9 @@ namespace BizHawk.Client.Common
 		[OptionalService]
 		public IInputPollable InputPollableCore { get; set; }
 
+		[OptionalService]
+		public IRegionable RegionableCore { get; set; }
+
 		public Action FrameAdvanceCallback { get; set; }
 		public Action YieldCallback { get; set; }
 
@@ -364,13 +367,9 @@ namespace BizHawk.Client.Common
 		)]
 		public string GetDisplayType()
 		{
-			if (Global.Game != null)
+			if (RegionableCore != null)
 			{
-				var displaytype = Emulator.GetType().GetProperty("DisplayType");
-				if (displaytype != null)
-				{
-					return displaytype.GetValue(Emulator, null).ToString();
-				}
+				return RegionableCore.Region.ToString();
 			}
 
 			return string.Empty;