From 37356647817b72a336eeedaa7472e268a04054c8 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 3 Apr 2020 11:37:05 +1000
Subject: Refactor dispose into finally to make debugging easier.

---
 src/WixToolset.Core.WindowsInstaller/MsiBackend.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
index 778720b9..cbd58381 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
@@ -26,6 +26,7 @@ namespace WixToolset.Core.WindowsInstaller
             var validator = Validator.CreateFromContext(context, "darice.cub");
 
             IBindResult result = null;
+            var dispose = true;
             try
             {
                 var command = new BindDatabaseCommand(context, backendExtensions, validator);
@@ -36,12 +37,15 @@ namespace WixToolset.Core.WindowsInstaller
                     extension.PostBackendBind(result);
                 }
 
+                dispose = false;
                 return result;
             }
-            catch
+            finally
             {
-                result?.Dispose();
-                throw;
+                if (dispose)
+                {
+                    result?.Dispose();
+                }
             }
         }
 
-- 
cgit v1.2.3-55-g6feb