diff --git a/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs b/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs
index e02908256..9cb9c54be 100644
--- a/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs
+++ b/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs
@@ -211,6 +211,8 @@ namespace Artemis.Core
{
if (_disposed)
throw new ObjectDisposedException("DataBinding");
+
+ IsEnabled = Entity.IsEnabled;
}
///
@@ -229,6 +231,7 @@ namespace Artemis.Core
throw new ObjectDisposedException("DataBinding");
Script.Save();
+ Entity.IsEnabled = IsEnabled;
Entity.NodeScript = Script?.Entity;
}
diff --git a/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs b/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs
index 059707618..99c4ab251 100644
--- a/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs
+++ b/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs
@@ -468,7 +468,7 @@ namespace Artemis.Core
Entity = entity ?? throw new ArgumentNullException(nameof(entity));
PropertyDescription = description ?? throw new ArgumentNullException(nameof(description));
IsLoadedFromStorage = fromStorage;
- DataBinding = new DataBinding(this);
+ DataBinding = Entity.DataBinding != null ? new DataBinding(this, Entity.DataBinding) : new DataBinding(this);
if (PropertyDescription.DisableKeyframes)
KeyframesSupported = false;
diff --git a/src/Artemis.Core/Services/RgbService.cs b/src/Artemis.Core/Services/RgbService.cs
index 1922b4c64..e814a0361 100644
--- a/src/Artemis.Core/Services/RgbService.cs
+++ b/src/Artemis.Core/Services/RgbService.cs
@@ -71,7 +71,7 @@ namespace Artemis.Core.Services
private void UtilitiesOnShutdownRequested(object? sender, EventArgs e)
{
- IsRenderPaused = true;
+ SetRenderPaused(true);
}
private void SurfaceOnLayoutChanged(SurfaceLayoutChangedEventArgs args)
diff --git a/src/Artemis.Core/VisualScripting/DataBindingNodeScript.cs b/src/Artemis.Core/VisualScripting/DataBindingNodeScript.cs
index 198fa0cb8..0fafe87d6 100644
--- a/src/Artemis.Core/VisualScripting/DataBindingNodeScript.cs
+++ b/src/Artemis.Core/VisualScripting/DataBindingNodeScript.cs
@@ -31,6 +31,8 @@ namespace Artemis.Core
DataBindingExitNode = new DataBindingExitNode(dataBinding);
ExitNode = DataBindingExitNode;
AddNode(ExitNode);
+
+ Load();
}
}
}
\ No newline at end of file
diff --git a/src/Artemis.Storage/Entities/Profile/DataBindings/DataBindingEntity.cs b/src/Artemis.Storage/Entities/Profile/DataBindings/DataBindingEntity.cs
index 1160c38ae..1b452f414 100644
--- a/src/Artemis.Storage/Entities/Profile/DataBindings/DataBindingEntity.cs
+++ b/src/Artemis.Storage/Entities/Profile/DataBindings/DataBindingEntity.cs
@@ -5,6 +5,7 @@ namespace Artemis.Storage.Entities.Profile.DataBindings
public class DataBindingEntity
{
public string Identifier { get; set; }
+ public bool IsEnabled { get; set; }
public NodeScriptEntity NodeScript { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Artemis.VisualScripting/packages.lock.json b/src/Artemis.VisualScripting/packages.lock.json
index 2074ce8e1..c32b192d0 100644
--- a/src/Artemis.VisualScripting/packages.lock.json
+++ b/src/Artemis.VisualScripting/packages.lock.json
@@ -344,13 +344,10 @@
},
"Serilog.Sinks.Console": {
"type": "Transitive",
- "resolved": "3.1.1",
- "contentHash": "56mI5AqvyF/i/c2451nvV71kq370XOCE4Uu5qiaJ295sOhMb9q3BWwG7mWLOVSnmpWiq0SBT3SXfgRXGNP6vzA==",
+ "resolved": "4.0.0",
+ "contentHash": "yJQit9sTJ4xGLKgCujqDJsaGqBNJwGB/H898z+xYlMG06twy4//6LLnSrsmpduZxcHIG4im7cv+JmXLzXz2EkQ==",
"dependencies": {
- "Serilog": "2.5.0",
- "System.Console": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.InteropServices.RuntimeInformation": "4.3.0"
+ "Serilog": "2.10.0"
}
},
"Serilog.Sinks.Debug": {
@@ -363,13 +360,10 @@
},
"Serilog.Sinks.File": {
"type": "Transitive",
- "resolved": "4.1.0",
- "contentHash": "U0b34w+ZikbqWEZ3ui7BdzxY/19zwrdhLtI3o6tfmLdD3oXxg7n2TZJjwCCTlKPgRuYic9CBWfrZevbb70mTaw==",
+ "resolved": "5.0.0",
+ "contentHash": "uwV5hdhWPwUH1szhO8PJpFiahqXmzPzJT/sOijH/kFgUx+cyoDTMM8MHD0adw9+Iem6itoibbUXHYslzXsLEAg==",
"dependencies": {
- "Serilog": "2.5.0",
- "System.IO.FileSystem": "4.0.1",
- "System.Text.Encoding.Extensions": "4.0.11",
- "System.Threading.Timer": "4.0.1"
+ "Serilog": "2.10.0"
}
},
"SharpVectors.Reloaded": {
@@ -379,19 +373,20 @@
},
"SkiaSharp.Views.Desktop.Common": {
"type": "Transitive",
- "resolved": "2.80.2",
- "contentHash": "0vBvweMysgl1wgjuTQUhdJMD5z5nBjtYqmnHPeX+qHfkc336Wj2L3jEqwmGb0YP+RV47gFGz0EzMAW6szZch9w==",
+ "resolved": "2.80.3",
+ "contentHash": "CMQu9fr3BxGRsRryDC6lkYbYaSI2CI+RqisFX0WIdbOdbigUOLhqchmKIMb4EdFAZk13vk862qiE9v97iDZS7g==",
"dependencies": {
- "SkiaSharp": "2.80.2"
+ "SkiaSharp": "2.80.3",
+ "System.Drawing.Common": "4.5.1"
}
},
"SkiaSharp.Views.WPF": {
"type": "Transitive",
- "resolved": "2.80.2",
- "contentHash": "Fzo2+MNwHDh9Cob8sk7OO26kp3bhofjXMwlEK8IncF1ehu9hi3sH9iQDJrue9a88VEJJ+yyLISPUFcmXlGHSyQ==",
+ "resolved": "2.80.3",
+ "contentHash": "oKUMm7WzFeoie6rW5nnwSGKZ94misyRsAc1wU6SEqgd6ssW17nyfohHxHuBHtmpLtIRwvjhfAu3cMLrpX/oNcw==",
"dependencies": {
- "SkiaSharp": "2.80.2",
- "SkiaSharp.Views.Desktop.Common": "2.80.2"
+ "SkiaSharp": "2.80.3",
+ "SkiaSharp.Views.Desktop.Common": "2.80.3"
}
},
"System.AppContext": {
@@ -1299,10 +1294,10 @@
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"Serilog": "2.10.0",
- "Serilog.Sinks.Console": "3.1.1",
+ "Serilog.Sinks.Console": "4.0.0",
"Serilog.Sinks.Debug": "2.0.0",
- "Serilog.Sinks.File": "4.1.0",
- "SkiaSharp": "2.80.2",
+ "Serilog.Sinks.File": "5.0.0",
+ "SkiaSharp": "2.80.3",
"System.Buffers": "4.5.1",
"System.IO.FileSystem.AccessControl": "5.0.0",
"System.Numerics.Vectors": "4.5.0",
@@ -1328,8 +1323,8 @@
"Ninject": "3.3.4",
"Ninject.Extensions.Conventions": "3.3.0",
"SharpVectors.Reloaded": "1.7.5",
- "SkiaSharp": "2.80.2",
- "SkiaSharp.Views.WPF": "2.80.2",
+ "SkiaSharp": "2.80.3",
+ "SkiaSharp.Views.WPF": "2.80.3",
"Stylet": "1.3.6",
"System.Buffers": "4.5.1",
"System.Numerics.Vectors": "4.5.0"