Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 84c79d5

Browse files
committed
Merge pull request #88 from github/shana/disposing
Adds some dispose calls
2 parents 895771e + 4bed92e commit 84c79d5

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/GitHub.App/Controllers/UIController.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,22 +160,22 @@ void SetupView(UIViewType viewType, IView view)
160160
var dvm = factory.GetViewModel(UIViewType.TwoFactor);
161161
disposables.Add(dvm);
162162
var twofa = dvm.Value;
163-
twofa.WhenAny(x => x.IsShowing, x => x.Value)
163+
disposables.Add(twofa.WhenAny(x => x.IsShowing, x => x.Value)
164164
.Where(x => x)
165165
.ObserveOn(RxApp.MainThreadScheduler)
166-
.Subscribe(_ => Fire(Trigger.Next));
166+
.Subscribe(_ => Fire(Trigger.Next)));
167167

168-
view.Done
168+
disposables.Add(view.Done
169169
.ObserveOn(RxApp.MainThreadScheduler)
170-
.Subscribe(_ => Fire(Trigger.Finish));
170+
.Subscribe(_ => Fire(Trigger.Finish)));
171171
}
172172
else if (viewType != UIViewType.TwoFactor)
173173
{
174-
view.Done
174+
disposables.Add(view.Done
175175
.ObserveOn(RxApp.MainThreadScheduler)
176-
.Subscribe(_ => Fire(Trigger.Next));
176+
.Subscribe(_ => Fire(Trigger.Next)));
177177
}
178-
view.Cancel.Subscribe(_ => Stop());
178+
disposables.Add(view.Cancel.Subscribe(_ => Stop()));
179179
}
180180

181181
IView CreateViewAndViewModel(UIViewType viewType)

src/GitHub.UI.Reactive/Controls/SimpleViewUserControl.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ protected virtual void Dispose(bool disposing)
6666
if (disposed) return;
6767

6868
close.Dispose();
69+
cancel.Dispose();
70+
isBusy.Dispose();
6971
disposed = true;
7072
}
7173
}

0 commit comments

Comments
 (0)