Fix overrides toolbox & enum control

Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml

@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:c="clr-namespace:Aurora.Controls"
              xmlns:u="clr-namespace:Aurora.Utils"
+             Loaded="UserControl_Loaded"
              mc:Ignorable="d">
     <StackPanel Orientation="Horizontal">
         <c:GameStateParameterPicker SelectedPath="{Binding StatePath}" PropertyType="Enum" Application="{u:AttachedApplicationBinding}" VerticalAlignment="Center" SelectedPathChanged="GameStateParameterPicker_SelectedPathChanged" />

Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Control_BooleanGSIEnum.xaml.cs

@@ -11,7 +11,6 @@ public partial class Control_BooleanGSIEnum : UserControl {
         public Control_BooleanGSIEnum(BooleanGSIEnum context) {
             InitializeComponent();
             ((FrameworkElement)Content).DataContext = context;
-            UpdateEnumDropDown();
         }
 
         /// <summary>Updates the enum value dropdown with a list of enum values for the current application and selected variable path.</summary>
@@ -28,6 +27,12 @@ private void UpdateEnumDropDown() {
             EnumVal.ItemsSource = isValid ? Utils.EnumUtils.GetEnumItemsSource(selectedEnumType) : null;
         }
 
+        // We don't do UpdateEnumDropDown in the constructor because it won't have been added to the visual tree at the point and therefore
+        // the attached application property won't be set. If we wait til the control has added to the tree, the property is set.
+        private void UserControl_Loaded(object sender, RoutedEventArgs e) {
+            UpdateEnumDropDown();
+        }
+
         // Update the enum dropdown when the user selects a different enum path
         private void GameStateParameterPicker_SelectedPathChanged(object sender, Controls.SelectedPathChangedEventArgs e) {
             UpdateEnumDropDown();

Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Control_EvaluatableToolbox.xaml.cs

@@ -130,7 +130,7 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
     /// </summary>
     public class TemplateEvaluatableTypeSelector : IValueConverter {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
-            value.GetType().GetGenericInterfaceTypes(typeof(Evaluatable<>))[0];
+            value.GetType().GetGenericParentTypes(typeof(Evaluatable<>))[0];
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
     }
 }