Skip to content

Commit a41b0d2

Browse files
Marc Piechuraghuntley
authored andcommitted
fix: resolved ViewModelViewHost memory leak on XAML platforms (#1336)
1 parent a353559 commit a41b0d2

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/ReactiveUI/Xaml/ViewModelViewHost.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,17 @@ public ViewModelViewHost()
104104
var view = viewLocator.ResolveView(x.ViewModel, x.Contract) ?? viewLocator.ResolveView(x.ViewModel, null);
105105

106106
if (view == null) {
107-
throw new Exception(String.Format("Couldn't find view for '{0}'.", x.ViewModel));
107+
throw new Exception($"Couldn't find view for '{x.ViewModel}'.");
108108
}
109109

110110
view.ViewModel = x.ViewModel;
111111
Content = view;
112112
}));
113-
});
114113

115-
this
116-
.WhenAnyObservable(x => x.ViewContractObservable)
117-
.ObserveOn(RxApp.MainThreadScheduler)
118-
.Subscribe(x => this.viewContract = x);
114+
d(this.WhenAnyObservable(x => x.ViewContractObservable)
115+
.ObserveOn(RxApp.MainThreadScheduler)
116+
.Subscribe(x => viewContract = x));
117+
});
119118
}
120119

121120
static void somethingChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)

0 commit comments

Comments
 (0)