From 9b95fa58030634faa2d3e8aabed202d797d1f82a Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 30 May 2023 11:12:19 -0400
Subject: [PATCH] Make it work after merge conflicts

---
 .../Avalonia.Win32.Interoperability.csproj                    | 4 ----
 .../WinForms/WinFormsAvaloniaControlHost.cs                   | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj b/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj
index cc1dfb385c..68c6fa69c9 100644
--- a/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj
+++ b/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj
@@ -2,12 +2,8 @@
   <PropertyGroup>
     <TargetFrameworks>net461;net6.0-windows</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
-    <ExtrasEnableImplicitWinFormsReferences>true</ExtrasEnableImplicitWinFormsReferences>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
-    <UseDirect3D9>true</UseDirect3D9>
     <PackageId>Avalonia.Win32.Interoperability</PackageId>
   </PropertyGroup>
 
diff --git a/src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs b/src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs
index 9ac00a8b8d..1f8c30030c 100644
--- a/src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs
+++ b/src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs
@@ -52,7 +52,7 @@ public class WinFormsAvaloniaControlHost : WinFormsControl
         _root = new();
         _root.Content = _content;
         _root.Prepare();
-        _root.Renderer.Start();
+        _root.StartRendering();
         _root.GotFocus += RootGotFocus;
 
         FixPosition();
@@ -64,6 +64,7 @@ public class WinFormsAvaloniaControlHost : WinFormsControl
     /// <inheritdoc />
     protected override void OnHandleDestroyed(EventArgs e)
     {
+        _root?.StopRendering();
         _root?.Dispose();
         _root = null;
         base.OnHandleDestroyed(e);