Send the latest non-null theme directly to the new action

Author: keveleigh

org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs

@@ -38,7 +38,7 @@ public Theme value
                     // element, but ChangeEvent<T> is used for its newValue/previousValue semantics
                     // and object pooling
                     SetValueWithoutNotify(value);
-                    SendEvent(changeEvent);
+                    onThemeChanged.Invoke(changeEvent);
                 }
             }
         }
@@ -53,22 +53,17 @@ public void SetValueWithoutNotify(Theme newValue)
 
         public void AddListener(UnityAction<ChangeEvent<Theme>> action)
         {
+            if (action == null) { return; }
             onThemeChanged.AddListener(action);
+            if (activeTheme == null) { return; }
             using ChangeEvent<Theme> changeEvent = ChangeEvent<Theme>.GetPooled(null, activeTheme);
-            SendEvent(changeEvent);
+            action.Invoke(changeEvent);
         }
 
         public void RemoveListener(UnityAction<ChangeEvent<Theme>> action)
         {
+            if (action == null) { return; }
             onThemeChanged.RemoveListener(action);
         }
-
-        private void SendEvent(EventBase e)
-        {
-            if (e is ChangeEvent<Theme> changeEvent)
-            {
-                onThemeChanged.Invoke(changeEvent);
-            }
-        }
     }
 }