From bf034b880fb4e82d3f00dc26dc1d92eb92c8dd56 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 27 Mar 2015 23:29:15 +0000
Subject: [PATCH] some misc bug fixes in some lua functions

---
 BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs | 2 +-
 BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
index 46d59a7142..ee86b2c51d 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
@@ -83,7 +83,7 @@ namespace BizHawk.Client.Common
 			"rshift",
 			"Logical shift right of 'val' by 'amt' bits"
 		)]
-		public static uint Rshift(int val, int amt)
+		public static uint Rshift(uint val, int amt)
 		{
 			return (uint)(val >> amt);
 		}
diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs
index 1648c70251..3677acf62f 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs
@@ -45,7 +45,7 @@ namespace BizHawk.Client.Common
 		)]
 		public static void DisplayVsync(bool enabled)
 		{
-			Global.Config.VSyncThrottle = enabled;
+			Global.Config.VSync = enabled;
 		}
 
 		[LuaMethodAttributes(