Merge branch 'release/6.0.4xx-sr3' into net6.0

dotnet · Jul 12, 2022 · 485d60b · 485d60b
2 parents 4014bf2 + 97ad1e2
commit 485d60b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
@@ -54,7 +54,7 @@ protected override void DisconnectHandler(AppCompatEditText platformView)
 			platformView.TextChanged -= OnTextChanged;
 
 			// TODO: NET7 issoto - Remove the casting once we can set the TPlatformView generic type as MauiAppCompatEditText
-			if (_set && PlatformView is MauiAppCompatEditText editText)
+			if (_set && platformView is MauiAppCompatEditText editText)
 				editText.SelectionChanged -= OnSelectionChanged;
 
 			_set = false;

diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
@@ -61,7 +61,7 @@ protected override void DisconnectHandler(AppCompatEditText platformView)
 			platformView.EditorAction -= OnEditorAction;
 
 			// TODO: NET7 issoto - Remove the casting once we can set the TPlatformView generic type as MauiAppCompatEditText
-			if (_set && PlatformView is MauiAppCompatEditText editText)
+			if (_set && platformView is MauiAppCompatEditText editText)
 				editText.SelectionChanged -= OnSelectionChanged;
 
 			_set = false;