Cleanup should always be attempted, and add some logging for it.

Continuation of #6297

1 files changed, 2 insertions, 3 deletions

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 98c98661..7e6e2922 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -592,13 +592,12 @@ static HRESULT RunNormal(
         ExitOnFailure(hr, "Failed while running ");
     } while (fReloadApp);
 
+LExit:
     if (!fSkipCleanup)
     {
-        hr = CoreCleanup(pEngineState);
-        ExitOnFailure(hr, "Failed to cleanup before shutting down");
+        CoreCleanup(pEngineState);
     }
 
-LExit:
     BurnExtensionUnload(&pEngineState->extensions);
 
     // If the message window is still around, close it.