Merge branch 'master' into theme/chinese-signs; Fix for bad merge

Author: kvakvs

TLM/TLM/Manager/Impl/OptionsManager.cs

@@ -309,7 +309,7 @@ public byte[] SaveData(ref bool success) {
         /// Triggers a rebuild of the main menu (toolbar), adding/removing buttons
         /// where applicable, and refreshing all translated text. Very slow.
         /// </summary>
-        internal static void RebuildMenu() {
+        internal static void RebuildMenu(bool languageChanged = false) {
             if (TMPELifecycle.Instance.Deserializing || ModUI.Instance == null) {
                 Log._Debug("OptionsManager.RebuildMenu() - Ignoring; Deserialising or ModUI.Instance is null");
                 return;
@@ -323,9 +323,11 @@ internal static void RebuildMenu() {
                 ModUI.Instance.MainMenuButton.UpdateButtonSkinAndTooltip();
             }
 
-            TrafficLightTextures.Instance.ReloadTexturesWithTranslation();
-            TMPELifecycle.Instance.TranslationDatabase.ReloadTutorialTranslations();
-            TMPELifecycle.Instance.TranslationDatabase.ReloadGuideTranslations();
+            if (languageChanged) {
+                TrafficLightTextures.Instance.ReloadTexturesWithTranslation();
+                TMPELifecycle.Instance.TranslationDatabase.ReloadTutorialTranslations();
+                TMPELifecycle.Instance.TranslationDatabase.ReloadGuideTranslations();
+            }
         }
 
         /// <summary>

TLM/TLM/Resources/incompatible_mods.txt

@@ -82,3 +82,7 @@
 2730687809;Network Extensions 3 - malware: https://github.com/CitiesSkylinesMods/TMPE/pull/1389 
 2733711176;CSM FIX
 2749420751;Uninspected TM:PE clone
+2759913350;1632320836 Service Vehicles Manager 2.0
+2764576667;CSM
+2781822295;交通管理器 汉化版TMPE_V11_STABLE
+2782552305;CSM

TLM/TLM/State/OptionsTabs/GeneralTab_LocalisationGroup.cs

@@ -101,7 +101,7 @@ private static void OnLanguageChanged(int newLanguageIndex) {
 
                 // TODO: Move this to the owner class and implement IObserver<ModUI.EventPublishers.LanguageChangeNotification>
                 Translation.SetCurrentLanguageToGameLanguage();
-                OptionsManager.RebuildMenu();
+                OptionsManager.RebuildMenu(true);
             } else if (newLanguageIndex - 1 < Translation.AvailableLanguageCodes.Count) {
                 // use tmpe language
                 string newLang = Translation.AvailableLanguageCodes[newLanguageIndex - 1];
@@ -110,7 +110,7 @@ private static void OnLanguageChanged(int newLanguageIndex) {
 
                 // TODO: Move this to the owner class and implement IObserver<ModUI.EventPublishers.LanguageChangeNotification>
                 Translation.SetCurrentLanguageToTMPELanguage();
-                OptionsManager.RebuildMenu();
+                OptionsManager.RebuildMenu(true);
             } else {
                 Log.Warning($"GeneralTab.LocalisationGroup.onLanguageChanged({newLanguageIndex}): Invalid language index");
                 return;

TLM/TLM/TLM.csproj

@@ -916,7 +916,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.Unity.Analyzers.1.7.0\analyzers\dotnet\cs\Microsoft.Unity.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.Unity.Analyzers.1.13.0\analyzers\dotnet\cs\Microsoft.Unity.Analyzers.dll" />
     <Analyzer Include="..\packages\ReflectionIT.Analyzer.Structs.0.1.0\analyzers\dotnet\cs\ReflectionIT.Analyzer.Structs.dll" />
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />

TLM/TLM/UI/ModUI.cs

@@ -146,8 +146,9 @@ internal void RebuildMenu() {
                     UnityEngine.Object.Destroy(keyHandler);
                 }
 
-                UnityEngine.Object.Destroy(MainMenu);
-                UnityEngine.Object.Destroy(MainMenuButton);
+                // intentionally DestroyImmediate() - normal Destroy() is delayed
+                UnityEngine.Object.DestroyImmediate(MainMenu);
+                UnityEngine.Object.DestroyImmediate(MainMenuButton);
                 MainMenu = null;
                 MainMenuButton = null;
 #if DEBUG

TLM/TLM/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="CitiesHarmony.API" version="2.0.0" targetFramework="net35" />
   <package id="CitiesHarmony.Harmony" version="2.0.4" targetFramework="net35" developmentDependency="true" />
-  <package id="Microsoft.Unity.Analyzers" version="1.7.0" targetFramework="net35" />
+  <package id="Microsoft.Unity.Analyzers" version="1.13.0" targetFramework="net35" developmentDependency="true" />
   <package id="ReflectionIT.Analyzer.Structs" version="0.1.0" targetFramework="net35" />
   <package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net35" developmentDependency="true" />
   <package id="UnifiedUILib" version="2.2.1" targetFramework="net35" />