Browse Source

Fixed some missed conflict resolutions.

Daniel C. Weber 7 years ago
parent
commit
7caaa0f18e

+ 3 - 3
Rx.NET/Source/src/System.Reactive/Concurrency/Scheduler.Recursive.cs

@@ -206,7 +206,7 @@ namespace System.Reactive.Concurrency
                 var sad = new SingleAssignmentDisposable();
 
                 Group.Add(sad);
-                sad.Disposable = scheduler.ScheduleAction((state, sad, @this: this), nextState =>
+                sad.Disposable = Scheduler.ScheduleAction((state, sad, @this: this), nextState =>
                 {
                     [email protected](nextState.sad);
                     [email protected](nextState.state);
@@ -235,7 +235,7 @@ namespace System.Reactive.Concurrency
                 var sad = new SingleAssignmentDisposable();
 
                 Group.Add(sad);
-                sad.Disposable = scheduler.ScheduleAction((state, sad, @this: this), time, nextState => {
+                sad.Disposable = Scheduler.ScheduleAction((state, sad, @this: this), time, nextState => {
                     [email protected](nextState.sad);
                     [email protected](nextState.state);
                 });
@@ -263,7 +263,7 @@ namespace System.Reactive.Concurrency
                 var sad = new SingleAssignmentDisposable();
 
                 Group.Add(sad);
-                sad.Disposable = scheduler.ScheduleAction((state, sad, @this: this), dtOffset, nextState => {
+                sad.Disposable = Scheduler.ScheduleAction((state, sad, @this: this), dtOffset, nextState => {
                     [email protected](nextState.sad);
                     [email protected](nextState.state);
                 });