From 4149da5f9edbfdae923c6ad7f84d3136d265c9b0 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Mon, 2 Oct 2023 18:57:40 +0200
Subject: [PATCH] Fix crash when generating project files with toolchain setup
 that fails

#1537
---
 Source/Tools/Flax.Build/Build/Platform.cs     | 22 +++++++++++++------
 .../Tools/Flax.Build/Utilities/Utilities.cs   |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Source/Tools/Flax.Build/Build/Platform.cs b/Source/Tools/Flax.Build/Build/Platform.cs
index 16f114363..f458225fa 100644
--- a/Source/Tools/Flax.Build/Build/Platform.cs
+++ b/Source/Tools/Flax.Build/Build/Platform.cs
@@ -244,7 +244,19 @@ namespace Flax.Build
         /// <returns>The toolchain.</returns>
         public Toolchain TryGetToolchain(TargetArchitecture targetArchitecture)
         {
-            return HasRequiredSDKsInstalled ? GetToolchain(targetArchitecture) : null;
+            Toolchain result = null;
+            if (HasRequiredSDKsInstalled)
+            {
+                try
+                {
+                    result = GetToolchain(targetArchitecture);
+                }
+                catch (Exception ex)
+                {
+                    Log.Exception(ex);
+                }
+            }
+            return result;
         }
 
         /// <summary>
@@ -260,16 +272,12 @@ namespace Flax.Build
             if (_toolchains == null)
                 _toolchains = new Dictionary<TargetArchitecture, Toolchain>();
 
-            var key = targetArchitecture;
-
             Toolchain toolchain;
-            if (_toolchains.TryGetValue(key, out toolchain))
-            {
+            if (_toolchains.TryGetValue(targetArchitecture, out toolchain))
                 return toolchain;
-            }
 
             toolchain = CreateToolchain(targetArchitecture);
-            _toolchains.Add(key, toolchain);
+            _toolchains.Add(targetArchitecture, toolchain);
 
             return toolchain;
         }
diff --git a/Source/Tools/Flax.Build/Utilities/Utilities.cs b/Source/Tools/Flax.Build/Utilities/Utilities.cs
index ed7116a5d..b001eea3f 100644
--- a/Source/Tools/Flax.Build/Utilities/Utilities.cs
+++ b/Source/Tools/Flax.Build/Utilities/Utilities.cs
@@ -764,7 +764,7 @@ namespace Flax.Build
         /// <summary>
         /// Sorts the directories by name assuming they contain version text. Sorted from lowest to the highest version.
         /// </summary>
-        /// <param name="file">The paths array to sort.</param>
+        /// <param name="paths">The paths array to sort.</param>
         public static void SortVersionDirectories(string[] paths)
         {
             if (paths == null || paths.Length == 0)