fix: avoid NRE occur when PublishedValue<nullable> observed (#526)

Closes #525
bdunderscore · Feb 6, 2025 · e3c8179 · e3c8179
1 parent 5843f4d
commit e3c8179
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changelog
+# Changelog
 
 All notable changes to this project will be documented in this file.
 
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Fixed
+- Avoid NRE that occurs when a null is observed in a PublishedValue (#526)
 
 ### Changed
 

diff --git a/Editor/PreviewSystem/ComputeContext/SingleObjectQueries.cs b/Editor/PreviewSystem/ComputeContext/SingleObjectQueries.cs
@@ -1,4 +1,4 @@
-#region
+#region
 
 #if NDMF_VRCSDK3_AVATARS
 using VRC.SDK3.Avatars.Components;
@@ -90,7 +90,7 @@ public static R Observe<T, R>(
         )
             where R : IEquatable<R>
         {
-            return ctx.Observe(val, extract, (a, b) => a.Equals(b), callerPath: callerPath, callerLine: callerLine);
+            return ctx.Observe(val, extract, (a, b) => a is null ? b is null : a.Equals(b), callerPath: callerPath, callerLine: callerLine);
         }
 
         /// <summary>