From b6df55bbf07c042d7ff4ef37889fac027eb0832f Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 15 Dec 2019 10:18:58 -0600
Subject: [PATCH] fix double new line in lua console.log()

---
 .../tools/Lua/Libraries/EmuLuaLibrary.Console.cs       |  5 ++++-
 BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs         | 10 ++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
index 0ee17b04f2..4639245f21 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
@@ -133,7 +133,10 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			GlobalWin.Tools.LuaConsole.WriteToOutputWindow(terminator);
+			if (!string.IsNullOrEmpty(terminator))
+			{
+				GlobalWin.Tools.LuaConsole.WriteToOutputWindow(terminator);
+			}
 		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index bd3d9cde22..6f8c4ebb37 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -462,6 +462,8 @@ namespace BizHawk.Client.EmuHawk
 			NumberOfScripts.Text = message;
 		}
 
+		private void WriteLine(string message) => WriteToOutputWindow(message + "\n");
+
 		private int _messageCount;
 		private const int MaxCount = 50;
 		public void WriteToOutputWindow(string message)
@@ -477,7 +479,7 @@ namespace BizHawk.Client.EmuHawk
 
 				if (_messageCount <= MaxCount)
 				{
-					OutputBox.Text += message + "\n";
+					OutputBox.Text += message;
 					OutputBox.SelectionStart = OutputBox.Text.Length;
 					OutputBox.ScrollToCaret();
 				}
@@ -874,7 +876,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			catch (IOException)
 			{
-				WriteToOutputWindow($"Unable to access file {item.Path}");
+				WriteLine($"Unable to access file {item.Path}");
 			}
 			catch (Exception ex)
 			{
@@ -1363,7 +1365,7 @@ namespace BizHawk.Client.EmuHawk
 				{
 					if (InputBox.Text.Contains("emu.frameadvance("))
 					{
-						WriteToOutputWindow("emu.frameadvance() can not be called from the console");
+						WriteLine("emu.frameadvance() can not be called from the console");
 						return;
 					}
 
@@ -1378,7 +1380,7 @@ namespace BizHawk.Client.EmuHawk
 
 							if (OutputBox.Text == consoleBeforeCall)
 							{
-								WriteToOutputWindow("Command successfully executed");
+								WriteLine("Command successfully executed");
 							}
 						});
 					});