diff --git a/CHANGELOG.md b/CHANGELOG.md index 1209bc1de..be1201318 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,16 @@ This changelog includes all versions and major variants of the mod going all the > Date format: dd/mm/yyyy +#### TM:PE V[11.7.1.2](https://github.com/CitiesSkylinesMods/TMPE/compare/11.7.1.1...11.7.1.2) STABLE, 11/10/2022 + +- [Fixed] Game crash on load (krzychu124) +- [Steam] [TM:PE v11 STABLE](https://steamcommunity.com/sharedfiles/filedetails/?id=1637663252) + +#### TM:PE V11.7.1.2 TEST, 11/10/2022 + +- [Fixed] Game crash on load (krzychu124) +- [Steam] [TM:PE v11 TEST](https://steamcommunity.com/sharedfiles/filedetails/?id=2489276785) + #### TM:PE V[11.7.1.1](https://github.com/CitiesSkylinesMods/TMPE/compare/11.7.0.1...11.7.1.1) STABLE, 10/10/2022 - [Meta] TM:PE 11.7.1.1 TEST branch released as STABLE - huge thanks to our beta testers! - [New] Dead-end lane connections #1613, #1213 (kianzarrin) diff --git a/TLM/TLM/Resources/whats_new.txt b/TLM/TLM/Resources/whats_new.txt index cb87cc203..4d554ad4c 100644 --- a/TLM/TLM/Resources/whats_new.txt +++ b/TLM/TLM/Resources/whats_new.txt @@ -1,3 +1,10 @@ +[Version] 11.7.1.2 +[Released] Oct 11th 2022 +[Link] tmpe-v11712-stable-11102022 +[Stable] +[Fixed] Game crash on load (krzychu124) +[/Version] + [Version] 11.7.1.1 [Released] Oct 10th 2022 [Link] tmpe-v11711-stable-10102022 diff --git a/TLM/TLM/UI/Helpers/SerializableUIOptionBase.cs b/TLM/TLM/UI/Helpers/SerializableUIOptionBase.cs index fd9a668e8..accb21025 100644 --- a/TLM/TLM/UI/Helpers/SerializableUIOptionBase.cs +++ b/TLM/TLM/UI/Helpers/SerializableUIOptionBase.cs @@ -5,6 +5,7 @@ namespace TrafficManager.UI.Helpers { using ICities; using System.Reflection; using System; + using System.Threading; using TrafficManager.State; using JetBrains.Annotations; using TrafficManager.Lifecycle; @@ -104,7 +105,8 @@ public void DefaultOnValueChanged(TVal newVal) { /* UI: */ - public bool HasUI => _ui != null; + // TODO FIX - temporary solution! + public bool HasUI => _ui != null && Thread.CurrentThread != SimulationManager.instance.m_simulationThread; protected TUI _ui; protected string _label; diff --git a/TLM/TLM/UI/WhatsNew/WhatsNew.cs b/TLM/TLM/UI/WhatsNew/WhatsNew.cs index 6a82fdbe1..a40737b79 100644 --- a/TLM/TLM/UI/WhatsNew/WhatsNew.cs +++ b/TLM/TLM/UI/WhatsNew/WhatsNew.cs @@ -11,7 +11,7 @@ namespace TrafficManager.UI.WhatsNew { public class WhatsNew { // bump and update what's new changelogs when new features added - public static readonly Version CurrentVersion = new Version(11,7,1,1); + public static readonly Version CurrentVersion = new Version(11,7,1,2); private const string WHATS_NEW_FILE = "whats_new.txt"; private const string RESOURCES_PREFIX = "TrafficManager.Resources.";