From 6f992e92e7b60957b02b7a0d3c6b61b06ea871a3 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sun, 9 May 2021 15:42:11 -0400
Subject: [PATCH] ok let's try this a different way so that mupen can work. now
 I allow the _lines and listcount to not get updated atomically, but hopefully
 the listcount gets updated before the user ever gets a chance to see it or
 interact with it (regardless of whenever that update actually happens)

---
 src/BizHawk.Client.EmuHawk/LogWindow.cs | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/LogWindow.cs b/src/BizHawk.Client.EmuHawk/LogWindow.cs
index 1963d175a3..f71baf5089 100644
--- a/src/BizHawk.Client.EmuHawk/LogWindow.cs
+++ b/src/BizHawk.Client.EmuHawk/LogWindow.cs
@@ -84,24 +84,24 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (!string.IsNullOrWhiteSpace(s))
 				{
-					if (invoked)
-						Invoke((Action<string>)doAppendInvoked,s);
-					else 
-						lock (_lines)
-							_lines.Add(s.TrimEnd('\r'));
+					lock (_lines)
+					{
+						_lines.Add(s.TrimEnd('\r'));
+						if (invoked)
+						{
+							//basically an easy way to post an update message which should hopefully happen before anything else happens (redraw or user interaction)
+							BeginInvoke((Action)doUpdateListSize);
+						}
+						else
+							doUpdateListSize();
+					}
 				}
 			}
 		}
 
-		private void doAppendInvoked(string value)
+		private void doUpdateListSize()
 		{
-			//note that we take precautions to update _lines and VirtualListSize together here
-			//the lock happens here and not outside the invoke because we want only one thread to be locking (that's the gui thread)
-			lock (_lines)
-			{
-				_lines.Add(value.TrimEnd('\r'));
-				virtualListView1.VirtualListSize = _lines.Count;
-			}
+			virtualListView1.VirtualListSize = _lines.Count;
 		}
 
 		private void appendInvoked(string str)