diff --git a/Runtime/Scripts/Variables/DashVariablesController.cs b/Runtime/Scripts/Variables/DashVariablesController.cs index b00ecfa7..360253c7 100644 --- a/Runtime/Scripts/Variables/DashVariablesController.cs +++ b/Runtime/Scripts/Variables/DashVariablesController.cs @@ -87,6 +87,11 @@ public void SetVariable(string p_name, T p_value) void ISerializationCallbackReceiver.OnAfterDeserialize() { + if (this.SafeIsUnityNull()) + { + return; + } + // Debug.Log("OnAfterDeserialize: "+_serializedVariables); using (var cachedContext = Cache.Claim()) { @@ -115,6 +120,10 @@ void ISerializationCallbackReceiver.OnAfterDeserialize() void ISerializationCallbackReceiver.OnBeforeSerialize() { // Debug.Log("OnBeforeSerialize"); + if (this.SafeIsUnityNull()) + { + return; + } using (var cachedContext = Cache.Claim()) { @@ -146,4 +155,4 @@ public void MarkDirty() #endif } } -} \ No newline at end of file +}