From 46505b396ef1153abcd0ff83fc230d3dc626f0de Mon Sep 17 00:00:00 2001
From: Fredrik Orderud <fredrik.orderud@ge.com>
Date: Tue, 23 Apr 2024 18:13:03 +0200
Subject: [PATCH] OutOfProcCOM: Change LocalServer COM unregistration to delete
 entire CLSID folder

Fixes #5960 where an empty HKCR\CLSID\{AF080472-F173-4D9D-8BE7-435776617347} folder still remains after unregistration
---
 core/extensions/OutOfProcCOM/COMRegistration/LocalServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/extensions/OutOfProcCOM/COMRegistration/LocalServer.cs b/core/extensions/OutOfProcCOM/COMRegistration/LocalServer.cs
index f37bc56438a..4e20317588d 100644
--- a/core/extensions/OutOfProcCOM/COMRegistration/LocalServer.cs
+++ b/core/extensions/OutOfProcCOM/COMRegistration/LocalServer.cs
@@ -35,7 +35,7 @@ public static void Unregister(Guid clsid, string tlbPath)
 
             // Unregister local server
             string serverKey = string.Format(KeyFormat.LocalServer32, clsid);
-            Registry.LocalMachine.DeleteSubKey(serverKey, throwOnMissingSubKey: false);
+            Registry.LocalMachine.DeleteSubKeyTree(serverKey, throwOnMissingSubKey: false);
 
             // Unregister type library
             TypeLib.Unregister(tlbPath);