From 2afd29e9c879ce0693f96d85dcd373ceda21d043 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 31 Oct 2020 16:07:23 +0100
Subject: [PATCH] Use existing OnDataContextChanged method.

---
 src/Avalonia.ReactiveUI/ReactiveUserControl.cs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
index 40d9666c3e..f4824ade0a 100644
--- a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
+++ b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
@@ -28,7 +28,6 @@ namespace Avalonia.ReactiveUI
             // This WhenActivated block calls ViewModel's WhenActivated
             // block if the ViewModel implements IActivatableViewModel.
             this.WhenActivated(disposables => { });
-            this.GetObservable(DataContextProperty).Subscribe(OnDataContextChanged);
             this.GetObservable(ViewModelProperty).Subscribe(OnViewModelChanged);
         }
 
@@ -47,16 +46,9 @@ namespace Avalonia.ReactiveUI
             set => ViewModel = (TViewModel)value;
         }
 
-        private void OnDataContextChanged(object value)
+        protected override void OnDataContextChanged(EventArgs e)
         {
-            if (value is TViewModel viewModel)
-            {
-                ViewModel = viewModel;
-            }
-            else
-            {
-                ViewModel = null;
-            }
+            ViewModel = DataContext as TViewModel;
         }
 
         private void OnViewModelChanged(object value)