Integrating latest 47acbe8

Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.cpp

@@ -343,6 +343,11 @@ namespace ScriptCanvasEditor
 
     bool ContainerTypeLineEdit::DisplayType(const AZ::TypeId& typeId)
     {
+        if (!m_dataTypeMenu.GetModel()->HasType(typeId))
+        {
+            return false;
+        }
+
         QSignalBlocker signalBlocker(m_ui->variableType);
         AZStd::string typeName = m_dataTypeMenu.GetModel()->FindTypeNameForTypeId(typeId);
 
@@ -633,4 +638,4 @@ namespace ScriptCanvasEditor
     }
 }
 
-#include <Editor/View/Dialogs/ContainerWizard/moc_ContainerTypeLineEdit.cpp>
+#include <Editor/View/Dialogs/ContainerWizard/moc_ContainerTypeLineEdit.cpp>

Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp

@@ -247,9 +247,11 @@ namespace ScriptCanvasEditor
                 if (!lineEdit->DisplayType(typeId))
                 {
                     selectedTypeId = lineEdit->GetDefaultTypeId();
-                    lineEdit->DisplayType(typeId);
+                    lineEdit->DisplayType(selectedTypeId);
                 }
             }
+
+            lineEdit->update();
             
             m_containerTypes[typeIndex] = selectedTypeId;
             workingCrc.Add(selectedTypeId.ToString<AZStd::string>().c_str());            

Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.cpp

@@ -11,7 +11,7 @@
 */
 
 #include "precompiled.h"
-#include "Settings.h"
+#include "SettingsDialog.h"
 // qtextformat.h(365): warning C4251: 'QTextFormat::d': class 'QSharedDataPointer<QTextFormatPrivate>' needs to have dll-interface to be used by clients of class 'QTextFormat'
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option")
 #include <QLineEdit>
@@ -27,7 +27,7 @@ AZ_POP_DISABLE_WARNING
 
 #include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
 
-#include "Editor/View/Dialogs/ui_Settings.h"
+#include "Editor/View/Dialogs/ui_SettingsDialog.h"
 
 namespace ScriptCanvasEditor
 {
@@ -220,5 +220,5 @@ namespace ScriptCanvasEditor
     }
 
 
-    #include <Editor/View/Dialogs/moc_Settings.cpp>
+    #include <Editor/View/Dialogs/moc_SettingsDialog.cpp>
 }