Fix NRE when accessing RxApp.SuspensionHost (reactiveui#2181)

InitialForce · Sep 29, 2019 · 89c4621 · 89c4621
1 parent 5b93917
commit 89c4621
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/ReactiveUI/RxApp.cs b/src/ReactiveUI/RxApp.cs
@@ -107,6 +107,7 @@ static RxApp()
                 });
             });
 
+            _suspensionHost = new SuspensionHost();
             if (ModeDetector.InUnitTestRunner())
             {
                 LogHost.Default.Warn("*** Detected Unit Test Runner, setting MainThreadScheduler to CurrentThread ***");
@@ -124,8 +125,6 @@ static RxApp()
             {
                 _mainThreadScheduler = DefaultScheduler.Instance;
             }
-
-            SuspensionHost = new SuspensionHost();
         }
 
         /// <summary>
@@ -202,12 +201,7 @@ public static IObserver<Exception> DefaultExceptionHandler
         /// </summary>
         public static ISuspensionHost SuspensionHost
         {
-            get
-            {
-                var host = _unitTestSuspensionHost ?? _suspensionHost;
-                return host;
-            }
-
+            get => _unitTestSuspensionHost ?? _suspensionHost;
             set
             {
                 if (ModeDetector.InUnitTestRunner())