Turned ResetComSafe on ComSafeManager into DisposeAndResetComSafe.

Author: MDoerner

RetailCoder.VBE/Extension.cs

@@ -42,7 +42,6 @@ public class _Extension : IDTExtensibility2
 
         private IWindsorContainer _container;
         private App _app;
-        private IComSafe _comSafe;
         private readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
         public void OnAddInsUpdate(ref Array custom) { }
@@ -52,9 +51,6 @@ public void OnConnection(object Application, ext_ConnectMode ConnectMode, object
         {
             try
             {
-                ComSafeManager.ResetComSafe();
-                _comSafe = ComSafeManager.GetCurrentComSafe();
-
                 if (Application is Microsoft.Vbe.Interop.VBE vbe1)
                 {
                     _ide = new VBEditor.SafeComWrappers.VBA.VBE(vbe1);
@@ -270,18 +266,6 @@ private void ShutdownAddIn()
                     _container.Dispose();
                     _container = null;
                 }
-
-                if (_comSafe != null)
-                {
-                    _logger.Log(LogLevel.Trace, "Disposing COM safe...");
-                    _comSafe.Dispose();
-                    _comSafe = null;
-                    _addin = null;
-                    _ide = null;
-                }
-
-                _isInitialized = false;
-                _logger.Log(LogLevel.Info, "No exceptions were thrown.");
             }
             catch (Exception e)
             {
@@ -291,11 +275,30 @@ private void ShutdownAddIn()
             }
             finally
             {
-                _logger.Log(LogLevel.Trace, "Unregistering AppDomain handlers....");
-                currentDomain.AssemblyResolve -= LoadFromSameFolder;
-                currentDomain.UnhandledException -= HandlAppDomainException;
-                _logger.Log(LogLevel.Trace, "Done. Main Shutdown completed. Toolwindows follow. Quack!");
-                _isInitialized = false;
+                try
+                {
+                    _logger.Log(LogLevel.Trace, "Disposing COM safe...");
+                    ComSafeManager.DisposeAndResetComSafe();
+                    _addin = null;
+                    _ide = null;
+
+                    _isInitialized = false;
+                    _logger.Log(LogLevel.Info, "No exceptions were thrown.");
+                }
+                catch (Exception e)
+                {
+                    _logger.Error(e);
+                    _logger.Log(LogLevel.Warn, "Exception disposing the ComSafe has been swallowed.");
+                    //throw; // <<~ uncomment to crash the process
+                }
+                finally
+                {
+                    _logger.Log(LogLevel.Trace, "Unregistering AppDomain handlers....");  
+                    currentDomain.AssemblyResolve -= LoadFromSameFolder;
+                    currentDomain.UnhandledException -= HandlAppDomainException;
+                    _logger.Log(LogLevel.Trace, "Done. Main Shutdown completed. Toolwindows follow. Quack!");
+                    _isInitialized = false;
+                }
             }
         }
     }

Rubberduck.VBEEditor/ComManagement/ComSafeManager.cs

@@ -11,9 +11,11 @@ public static IComSafe GetCurrentComSafe()
             return _comSafe.Value;
         }
 
-        public static void ResetComSafe()
+        public static void DisposeAndResetComSafe()
         {
+            var oldComSafe = _comSafe.Value;
             _comSafe = new Lazy<IComSafe>(NewComSafe);
+            oldComSafe.Dispose();
         }
 
         private static IComSafe NewComSafe()

RubberduckTests/VBEditor/ComSafeManagerTests.cs

@@ -9,7 +9,7 @@ public class ComSafeManagerTests
         [Test()]
         public void ComSafeReturnedOnSecondIvokationOfGetCurrentComSafeIsTheSame()
         {
-            ComSafeManager.ResetComSafe(); //Resetting to get a claen start.
+            ComSafeManager.DisposeAndResetComSafe(); //Resetting to get a claen start.
 
             var comSafe1 = ComSafeManager.GetCurrentComSafe();
             var comSafe2 = ComSafeManager.GetCurrentComSafe();
@@ -20,10 +20,10 @@ public void ComSafeReturnedOnSecondIvokationOfGetCurrentComSafeIsTheSame()
         [Test()]
         public void AfterCallingResetComSafeGetCurrentComSafeReturnsDifferentSafe()
         {
-            ComSafeManager.ResetComSafe(); //Resetting to get a claen start.
+            ComSafeManager.DisposeAndResetComSafe(); //Resetting to get a claen start.
 
             var comSafe1 = ComSafeManager.GetCurrentComSafe();
-            ComSafeManager.ResetComSafe();
+            ComSafeManager.DisposeAndResetComSafe();
             var comSafe2 = ComSafeManager.GetCurrentComSafe();
 
             Assert.AreNotSame(comSafe1, comSafe2);