Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions src/GitHub.App/Controllers/UIController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -160,22 +160,22 @@ void SetupView(UIViewType viewType, IView view)
var dvm = factory.GetViewModel(UIViewType.TwoFactor);
disposables.Add(dvm);
var twofa = dvm.Value;
twofa.WhenAny(x => x.IsShowing, x => x.Value)
disposables.Add(twofa.WhenAny(x => x.IsShowing, x => x.Value)
.Where(x => x)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ => Fire(Trigger.Next));
.Subscribe(_ => Fire(Trigger.Next)));

view.Done
disposables.Add(view.Done
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ => Fire(Trigger.Finish));
.Subscribe(_ => Fire(Trigger.Finish)));
}
else if (viewType != UIViewType.TwoFactor)
{
view.Done
disposables.Add(view.Done
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ => Fire(Trigger.Next));
.Subscribe(_ => Fire(Trigger.Next)));
}
view.Cancel.Subscribe(_ => Stop());
disposables.Add(view.Cancel.Subscribe(_ => Stop()));
}

IView CreateViewAndViewModel(UIViewType viewType)
Expand Down
2 changes: 2 additions & 0 deletions src/GitHub.UI.Reactive/Controls/SimpleViewUserControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ protected virtual void Dispose(bool disposing)
if (disposed) return;

close.Dispose();
cancel.Dispose();
isBusy.Dispose();
disposed = true;
}
}
Expand Down