Options value set - threading fix

CitiesSkylinesMods · Oct 11, 2022 · e6a73b1 · e6a73b1
1 parent 503421d
commit e6a73b1
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 8 deletions.
diff --git a/TLM/TLM/UI/Helpers/CheckboxOption.cs b/TLM/TLM/UI/Helpers/CheckboxOption.cs
@@ -4,7 +4,9 @@ namespace TrafficManager.UI.Helpers {
     using TrafficManager.State;
     using CSUtil.Commons;
     using System.Collections.Generic;
+    using ColossalFramework.Threading;
     using JetBrains.Annotations;
+    using TrafficManager.Util;
     using UnityEngine;
 
     public class CheckboxOption : SerializableUIOptionBase<bool, UICheckBox, CheckboxOption> {
@@ -74,7 +76,19 @@ public CheckboxOption(string fieldName, Options.PersistTo scope = Options.Persis
                 if (!value && _propagatesFalseTo != null)
                     PropagateTo(_propagatesFalseTo, false);
 
-                if (HasUI) _ui.isChecked = value;
+                if (Shortcuts.IsMainThread()) {
+                    if (HasUI) {
+                        _ui.isChecked = value;
+                    }
+                } else {
+                    SimulationManager.instance
+                                     .m_ThreadingWrapper
+                                     .QueueMainThread(() => {
+                                         if (HasUI) {
+                                             _ui.isChecked = value;
+                                         }
+                                     });
+                }
             }
         }
 

diff --git a/TLM/TLM/UI/Helpers/DropDownOption.cs b/TLM/TLM/UI/Helpers/DropDownOption.cs
@@ -6,6 +6,7 @@ namespace TrafficManager.UI.Helpers {
     using System;
     using System.Linq;
     using TrafficManager.API.Traffic.Enums;
+    using TrafficManager.Util;
 
     public class DropDownOption<TEnum> : SerializableUIOptionBase<TEnum, UIDropDown, DropDownOption<TEnum>>
         where TEnum : struct, Enum, IConvertible {
@@ -50,8 +51,18 @@ public DropDownOption(string fieldName, Options.PersistTo scope = Options.Persis
             set {
                 if (values_.Contains(value)) {
                     base.Value = value;
-                    if (HasUI) {
-                        _ui.selectedIndex = IndexOf(value);
+                    if (Shortcuts.IsMainThread()) {
+                        if (HasUI) {
+                            _ui.selectedIndex = IndexOf(value);
+                        }
+                    } else {
+                        SimulationManager.instance
+                                         .m_ThreadingWrapper
+                                         .QueueMainThread(() => {
+                                             if (HasUI) {
+                                                 _ui.selectedIndex = IndexOf(value);
+                                             }
+                                         });
                     }
                 } else {
                     Log.Error($"unrecognised value:{value} for enum:{typeof(TEnum).Name}");

diff --git a/TLM/TLM/UI/Helpers/SerializableUIOptionBase.cs b/TLM/TLM/UI/Helpers/SerializableUIOptionBase.cs
@@ -105,8 +105,7 @@ public abstract class SerializableUIOptionBase<TVal, TUI, TComponent> : ILegacyS
 
         /* UI: */
 
-        // TODO FIX - temporary solution!
-        public bool HasUI => _ui != null && Thread.CurrentThread != SimulationManager.instance.m_simulationThread;
+        public bool HasUI => _ui != null;
         protected TUI _ui;
 
         protected string _label;

diff --git a/TLM/TLM/UI/Helpers/SliderOption.cs b/TLM/TLM/UI/Helpers/SliderOption.cs
@@ -6,6 +6,7 @@ namespace TrafficManager.UI.Helpers {
     using CSUtil.Commons;
     using UnityEngine;
     using System;
+    using TrafficManager.Util;
 
     public class SliderOption : SerializableUIOptionBase<float, UISlider, SliderOption> {
 
@@ -70,9 +71,20 @@ public byte FloatToByte(float val)
 
                 Log.Info($"SliderOption.Value: `{FieldName}` changed to {value}");
 
-                if (HasUI) {
-                    _ui.value = value;
-                    UpdateTooltip();
+                if (Shortcuts.IsMainThread()) {
+                    if (HasUI) {
+                        _ui.value = value;
+                        UpdateTooltip();
+                    }
+                } else {
+                    SimulationManager.instance
+                                     .m_ThreadingWrapper
+                                     .QueueMainThread(() => {
+                                         if (HasUI) {
+                                             _ui.value = value;
+                                             UpdateTooltip();
+                                         }
+                                     });
                 }
             }
         }

diff --git a/TLM/TLM/Util/Shortcuts.cs b/TLM/TLM/Util/Shortcuts.cs
@@ -13,11 +13,14 @@ namespace TrafficManager.Util {
     using UnityEngine;
     using ColossalFramework.UI;
     using System.Diagnostics;
+    using ColossalFramework.Threading;
 
     internal static class Shortcuts {
         internal static bool InSimulationThread() =>
             System.Threading.Thread.CurrentThread == SimulationManager.instance.m_simulationThread;
 
+        internal static bool IsMainThread() => Dispatcher.currentSafe == Dispatcher.mainSafe;
+
         /// <summary>
         /// returns a new calling Clone() on all items.
         /// </summary>