Wrapped the designer in od a VBComponent as a UserFrom.

Author: MDoerner

Rubberduck.VBEEditor/SafeComWrappers/VBA/VBComponent.cs

@@ -43,11 +43,11 @@ public IControls Controls
             {
                 var designer = IsWrappingNullReference
                     ? null
-                    : Target.Designer as VB.Forms.UserForm;
+                    : new UserForm(Target.Designer as VB.Forms.UserForm);
 
                 return designer == null 
                     ? new Controls(null) 
-                    : new Controls(designer.Controls);
+                    : designer.Controls;
             }
         }
 
@@ -57,11 +57,11 @@ public IControls SelectedControls
             {
                 var designer = IsWrappingNullReference
                     ? null
-                    : Target.Designer as VB.Forms.UserForm;
+                    : new UserForm(Target.Designer as VB.Forms.UserForm);
 
                 return designer == null
                     ? new Controls(null)
-                    : new Controls(designer.Selected);
+                    : designer.Selected;
             }
         }
 
@@ -73,9 +73,10 @@ public bool HasDesigner
                 {
                     return false;
                 }
-                var designer = Target.Designer;
-                var hasDesigner = designer != null;
-                return hasDesigner;
+                using (var designer = new UserForm(Target.Designer as VB.Forms.UserForm))
+                {
+                    return !designer.IsWrappingNullReference;
+                }
             }
         }
 
@@ -188,17 +189,6 @@ private string ExportToTempFile()
             Export(path);
             return path;
         }
-        //public override void Release(bool final = false)
-        //{
-        //    if (!IsWrappingNullReference)
-        //    {
-        //        DesignerWindow().Release();
-        //        Controls.Release();
-        //        Properties.Release();
-        //        CodeModule.Release();
-        //        base.Release(final);
-        //    }
-        //}
 
         public override bool Equals(ISafeComWrapper<VB.VBComponent> other)
         {