Merge pull request #1230 from EOS-Contrib/eosu-883-Fix-multi-deployment-selection

Bug: Fix deployment selection when multiple deployments exist (EOSU-883)

Author: DanF-ApexSystems

Assets/Plugins/Source/Editor/EditorWindows/EOSSettingsWindow.cs

@@ -254,13 +254,10 @@ private void Save()
             _productConfigEditor.Save();
 
             //Update deployment in current platform
-            if (ProductConfig.Get<ProductConfig>().Environments.TryGetFirstDefinedNamedDeployment(out var namedDep))
-            {
-                _platformConfigEditors[_selectedTab].SetDeployment(namedDep.Value);
-            }
-            else
+            if(!ProductConfig.Get<ProductConfig>().Environments.TryGetFirstDefinedNamedDeployment(out var namedDep))
             {
                 Debug.LogError($"{nameof(EOSSettingsWindow)} {nameof(Save)}: No named deployment found for current platform tab: {_platformConfigEditors[_selectedTab].GetPlatform()}");
+                return;
             }
             // Save each of the platform config editors.
             foreach (IConfigEditor editor in _platformConfigEditors)
@@ -269,6 +266,8 @@ private void Save()
             }
             AssetDatabase.SaveAssets();
             AssetDatabase.Refresh();
+            _platformTabs = BuildPlatformTabsDynamic();
+            Repaint();
         }
 
         /// <summary>

Assets/Plugins/Source/Editor/Utility/GUIEditorUtility.cs

@@ -868,7 +868,7 @@ private static void RenderDeploymentInputs(ref ProductionEnvironments value)
                             nameRect,
                             string.IsNullOrEmpty,
                             item.Name,
-                            "Sandbox Name");
+                            "Deployment Name");
 
                         if (!item.TrySetName(newItemName))
                         {
@@ -926,6 +926,10 @@ private static void RenderDeploymentInputs(ref ProductionEnvironments value)
                             break;
                         }
                     }
+                    else
+                    {
+                        item.Value.SandboxId = productionEnvironmentsCopy.Sandboxes[0].Value;
+                    }
                 },
                 () => productionEnvironmentsCopy.Deployments.Add(),
                 (item) =>
@@ -934,6 +938,7 @@ private static void RenderDeploymentInputs(ref ProductionEnvironments value)
                     {
                         // TODO: Tell user why deployment could not be removed
                         //       from the Production Environments.
+                        Debug.LogError($"{nameof(GUIEditorUtility)} {nameof(RenderDeploymentInputs)}: Failed to find deployment with name {item.Name} when trying to remove it.");
                     }
                 });
         }