Skip to content

4.x: Have the ControlScheduler do more eager disposed checks #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 26, 2018
Merged

4.x: Have the ControlScheduler do more eager disposed checks #529

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fbaaf9
4.x: Have the ControlScheduler do more eager disposed checks
akarnokd May 25, 2018
3331b76
Fix style
akarnokd May 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions Rx.NET/Source/src/System.Reactive/Platforms/Desktop/Concurrency/ControlScheduler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,16 @@ public override IDisposable Schedule<TState>(TState state, Func<IScheduler, TSta
if (action == null)
throw new ArgumentNullException(nameof(action));

if (_control.IsDisposed)
{
return Disposable.Empty;
}

var d = new SingleAssignmentDisposable();

_control.BeginInvoke(new Action(() =>
{
if (!d.IsDisposed)
if (!_control.IsDisposed && !d.IsDisposed)
d.Disposable = action(this, state);
}));

Expand Down Expand Up @@ -94,7 +99,10 @@ public override IDisposable Schedule<TState>(TState state, TimeSpan dueTime, Fun
{
try
{
d.Disposable = action(scheduler1, state1);
if (!_control.IsDisposed && !d.IsDisposed)
{
d.Disposable = action(scheduler1, state1);
}
}
finally
{
Expand Down Expand Up @@ -156,7 +164,10 @@ public IDisposable SchedulePeriodic<TState>(TState state, TimeSpan period, Func<

timer.Tick += (s, e) =>
{
state1 = action(state1);
if (!_control.IsDisposed)
{
state1 = action(state1);
}
};

timer.Interval = (int)period.TotalMilliseconds;
Expand Down