Fix null scheduler

reactiveui · Nov 18, 2023 · 970f728 · 970f728
1 parent 3d8b07e
commit 970f728
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/ReactiveUI/ObservableForProperty/POCOObservableForProperty.cs b/src/ReactiveUI/ObservableForProperty/POCOObservableForProperty.cs
@@ -34,7 +34,7 @@ public class POCOObservableForProperty : ICreatesObservableForProperty
             _hasWarned[(type, propertyName)] = true;
         }
 
-        return Observable.Return(new ObservedChange<object, object?>(sender, expression, default), RxApp.MainThreadScheduler)
+        return Observable.Return(new ObservedChange<object, object?>(sender, expression, default), RxApp.MainThreadScheduler ?? CurrentThreadScheduler.Instance)
                          .Concat(Observable<IObservedChange<object, object?>>.Never);
     }
 }
diff --git a/src/ReactiveUI/RxApp.cs b/src/ReactiveUI/RxApp.cs
@@ -122,10 +122,7 @@ static RxApp()
 
         LogHost.Default.Info("Initializing to normal mode");
 
-        if (_mainThreadScheduler is null)
-        {
-            _mainThreadScheduler = DefaultScheduler.Instance;
-        }
+        _mainThreadScheduler ??= DefaultScheduler.Instance;
     }
 
     /// <summary>