From 1b9ebbfa01295d760a8d2f105f0a8e6ae841ed49 Mon Sep 17 00:00:00 2001
From: Terje Sandstrom <terje@hermit.no>
Date: Wed, 6 Oct 2021 19:18:28 +0200
Subject: [PATCH] Fix for #865

---
 .../NUnitEngine/NUnitEngineAdapter.cs               | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/NUnitTestAdapter/NUnitEngine/NUnitEngineAdapter.cs b/src/NUnitTestAdapter/NUnitEngine/NUnitEngineAdapter.cs
index 1414aac2..9ab7666e 100644
--- a/src/NUnitTestAdapter/NUnitEngine/NUnitEngineAdapter.cs
+++ b/src/NUnitTestAdapter/NUnitEngine/NUnitEngineAdapter.cs
@@ -122,8 +122,15 @@ public void CloseRunner()
             if (Runner.IsTestRunning)
                 Runner.StopRun(true);
 
-            Runner.Unload();
-            Runner.Dispose();
+            try
+            {
+                Runner.Unload();
+                Runner.Dispose();
+            }
+            catch (NUnitEngineUnloadException ex)
+            {
+                logger.Warning($"Engine encountered NUnitEngineUnloadException :  {ex.Message}");
+            }
             Runner = null;
         }
 
@@ -159,7 +166,7 @@ public string GetXmlFilePath(string folder, string defaultFileName, string exten
             int i = 1;
             while (true)
             {
-                string path = Path.Combine(folder,  $"{defaultFileName}.{i++}.{extension}");
+                string path = Path.Combine(folder, $"{defaultFileName}.{i++}.{extension}");
                 if (!File.Exists(path))
                     return path;
             }