fix multithread bug from logging in paralell.foreach

Author: LeftofZen

AvaGui/Models/FileSystemItemGroup.cs

@@ -1,4 +1,3 @@
-using Avalonia;
 using Avalonia.Data.Converters;
 using OpenLoco.ObjectEditor.Data;
 using OpenLoco.ObjectEditor.Objects;

AvaGui/Models/ObjectEditorModel.cs

@@ -58,11 +58,13 @@ public class ObjectEditorModel : ReactiveObject // todo: only viewmodels should
 
 		public static string SettingsFile => Path.Combine(SettingsPath, "settings.json");
 
-		public ObservableCollection<LogLine> LoggerObservableLogs => ((Logger)Logger).Logs;
+		public ObservableCollection<LogLine> LoggerObservableLogs = new();
 
 		public ObjectEditorModel()
 		{
 			Logger = new Logger();
+			LoggerObservableLogs = new ObservableCollection<LogLine>(((Logger)Logger).Logs);
+
 			LoadSettings(SettingsFile, Logger);
 		}
 

AvaGui/Models/UiSoundObject.cs

@@ -1,5 +1,4 @@
 using OpenLoco.ObjectEditor.Types;
-using System.ComponentModel;
 
 namespace AvaGui.Models
 {

AvaGui/Typedefs.cs

@@ -1,15 +1,2 @@
-global using uint8_t = System.Byte;
-global using int8_t = System.SByte;
-global using uint16_t = System.UInt16;
 global using int16_t = System.Int16;
-global using int32_t = System.Int32;
 global using uint32_t = System.UInt32;
-global using size_t = System.UInt32;
-global using char_t = System.Byte;
-global using string_id = System.UInt16;
-global using image_id = System.UInt32;
-global using object_id = System.Byte;
-global using Speed16 = System.Int16;
-global using Speed32 = System.Int32;
-global using MicroZ = System.Byte;
-global using SoundObjectId = System.Byte;

AvaGui/ViewModels/ImageTableViewModel.cs

@@ -16,12 +16,7 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 using System.ComponentModel;
-using System.Collections.ObjectModel;
 using OpenLoco.ObjectEditor.Types;
-using AvaGui.Models;
-using Avalonia.Media;
-using Avalonia.Markup.Xaml.Converters;
-using Avalonia.Data.Converters;
 
 namespace AvaGui.ViewModels
 {

AvaGui/ViewModels/ObjectEditorViewModel.cs

@@ -8,11 +8,8 @@
 using OpenLoco.ObjectEditor.Headers;
 using System.Reactive;
 using OpenLoco.ObjectEditor.Logging;
-using System.Linq;
 using System.Threading.Tasks;
 using Core.Objects.Sound;
-using System.Drawing;
-using Avalonia.Media;
 
 namespace AvaGui.ViewModels
 {

AvaGui/Views/MainWindow.axaml.cs

@@ -1,6 +1,4 @@
 using Avalonia.Controls;
-using AvaGui.Models;
-using AvaGui.ViewModels;
 
 namespace AvaGui.Views
 {

Core/DatFileParsing/SawyerStreamReader.cs

@@ -165,9 +165,13 @@ static void ValidateLocoStruct(S5Header s5Header, ILocoStruct locoStruct, ILogge
 
 			try
 			{
-				if (s5Header.SourceGame == SourceGame.Vanilla && !OriginalObjectFiles.Names.ContainsKey(s5Header.Name.Trim()))
+				if (s5Header.SourceGame == SourceGame.Vanilla)
 				{
-					warnings.Add($"\"{s5Header.Name}\" is not a vanilla object but is marked as such.");
+					var s5Name = s5Header.Name.Trim();
+					if (!OriginalObjectFiles.Names.TryGetValue(s5Name, out var value) || s5Header.Checksum != value)
+					{
+						warnings.Add($"\"{s5Header.Name}\" is not a vanilla object but is marked as such.");
+					}
 				}
 
 				if (!locoStruct.Validate())

Shared/Logger.cs

@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.Concurrent;
 
 namespace OpenLoco.ObjectEditor.Logging
 {
@@ -15,15 +15,15 @@ public override string ToString()
 
 	public class Logger : ILogger
 	{
-		public readonly ObservableCollection<LogLine> Logs = [];
+		public readonly ConcurrentQueue<LogLine> Logs = [];
 		public LogLevel Level = LogLevel.Info;
 
 		public event EventHandler<LogAddedEventArgs>? LogAdded;
 
 		public void Log(LogLevel level, string message, string callerMemberName = "")
 		{
 			var log = new LogLine(DateTime.Now, level, callerMemberName, message);
-			Logs.Add(log);
+			Logs.Enqueue(log);
 
 			if (Level <= level)
 			{