+ Marshal.ReleaseComObject for VBE window

Author: josef-poetzl

source/AccessCodeLib.Common.VbeUserControlHost/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]

source/AccessCodeLib.Common.VbeUserControlHost/VbeUserControl.cs

@@ -10,14 +10,14 @@ namespace AccessCodeLib.Common.VBIDETools
     public class VbeUserControl<TControl> : IDisposable
     {
         private readonly TControl _control;
-        private readonly Window _vbeWindow;
+        private Window _vbeWindow;
 
         public VbeUserControl(AddIn addIn, string caption, string positionGuid, 
                                 TControl controlToHost, bool visible = true,
-                                string VbideUserControlHostProgId = VbeUserControlHostSettings.ProgId)
+                                string vbideUserControlHostProgId = VbeUserControlHostSettings.ProgId)
         {
             object docObj = null;
-            _vbeWindow = addIn.VBE.Windows.CreateToolWindow(addIn, VbideUserControlHostProgId,
+            _vbeWindow = addIn.VBE.Windows.CreateToolWindow(addIn, vbideUserControlHostProgId,
                                                             caption, positionGuid, ref docObj);
             _vbeWindow.Visible = true;
 
@@ -88,16 +88,33 @@ protected virtual void Dispose(bool disposing)
             {
                 DisposeManagedResources();
             }
+            DisposeUnmanagedResources();
             _disposed = true;
         }
 
         private void DisposeManagedResources()
         {
-            try
+            if (_control is IDisposable disposableControl)
+            {
+                disposableControl.Dispose();
+            }
+        }   
+
+        private void DisposeUnmanagedResources()
+        {
+            if (_vbeWindow != null)
             {
-                _vbeWindow.Close();
+                try
+                {
+                    _vbeWindow.Close();
+                }
+                catch { /* ignore */ }
+                finally
+                {
+                    Marshal.ReleaseComObject(_vbeWindow);
+                    _vbeWindow = null;
+                }
             }
-            catch { /* ignore */ }
         }
 
         public void Dispose()