Expand the lock's scopes.

Author: bclothier

Rubberduck.VBEEditor/Events/VbeEvents.cs

@@ -15,9 +15,9 @@ public sealed class VBEEvents : IVBEEvents
 
         public static VBEEvents Initialize(IVBE vbe)
         {
-            if (_instance == null)
+            lock (Lock)
             {
-                lock (Lock)
+                if (_instance == null)
                 {
                     _instance = new VBEEvents(vbe);
                 }
@@ -28,13 +28,13 @@ public static VBEEvents Initialize(IVBE vbe)
 
         public static void Terminate()
         {
-            if (_instance == null)
-            {
-                return;
-            }
-
             lock (Lock)
             {
+                if (_instance == null)
+                {
+                    return;
+                }
+
                 _instance.Dispose();
                 _instance = null;
             }

Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj

@@ -147,7 +147,7 @@
     <Compile Include="Events\ProjectEventArgs.cs" />
     <Compile Include="Events\ProjectRenamedEventArgs.cs" />
     <Compile Include="Events\SelectionChangedEventArgs.cs" />
-    <Compile Include="Events\VbeEvents.cs" />
+    <Compile Include="Events\VBEEvents.cs" />
     <Compile Include="Events\VBENativeServices.cs" />
     <Compile Include="Events\WindowChangedEventArgs.cs" />
     <Compile Include="Extensions\VBComponentExtensions.cs" />

Rubberduck.VBEEditor/SafeComWrappers/SafeEventedComWrapper.cs

@@ -25,18 +25,18 @@ protected override void Dispose(bool disposing)
 
         public void AttachEvents()
         {
-            if (IsWrappingNullReference)
+            lock (_lock)
             {
-                return;
-            }
+                if (IsWrappingNullReference)
+                {
+                    return;
+                }
 
-            if (_cookie != NotAdvising)
-            {
-                return;
-            }
+                if (_cookie != NotAdvising)
+                {
+                    return;
+                }
 
-            lock (_lock)
-            {
                 // Call QueryInterface for IConnectionPointContainer
                 var icpc = (IConnectionPointContainer) Target;