Merge branch 'master' into development

src/Artemis.Core/Plugins/Modules/DataModel.cs

@@ -261,7 +261,12 @@ namespace Artemis.Core.Modules
         internal T? GetDynamicChildValue<T>(string key)
         {
             if (TryGetDynamicChild(key, out DynamicChild? dynamicChild) && dynamicChild.BaseValue != null)
-                return (T) dynamicChild.BaseValue;
+            {
+                if (dynamicChild.BaseValue is T value)
+                    return value;
+                return default;
+            }
+
             return default;
         }
 

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml

@@ -462,7 +462,7 @@
                         The profile is currently running in normal mode and the timeline cannot be edited.
                     </TextBlock>
                     <TextBlock Style="{StaticResource MaterialDesignBody2TextBlock}" TextWrapping="Wrap" HorizontalAlignment="Center" TextAlignment="Center">
-                        Press <Run Text="F5" FontWeight="Bold"/> to switch between editor mode and normal mode. Auto-switching can be disabled in the options menu.
+                        Press <Run Text="F5" FontWeight="Bold"/> to switch between editor mode and normal mode. Auto-switching can be disabled in the run menu.
                     </TextBlock>
                 </StackPanel>
             </Border>