Fix up vbeEVents to be reloaded when the add-in has been reloaded because statics do not die at addin's end. Instead, we keep the _terminated variable as a static variable which is reset internally to communicate the state.

Author: bclothier

Rubberduck.VBEEditor/Events/VbeEvents.cs

@@ -15,13 +15,18 @@ public sealed class VbeEvents : IVbeEvents
         private readonly Dictionary<string, IVBComponents> _components;
         private readonly Dictionary<string, IReferences> _references;
 
+        private static long _terminated;
+        private const long _true = 1;
+        private const long _false = 0;
+
         public static VbeEvents Initialize(IVBE vbe)
         {
             lock (_instanceLock)
             {
                 if (_instance == null)
                 {
                     _instance = new VbeEvents(vbe);
+                    Interlocked.Exchange(ref _terminated, _false);
                 }
             }
 
@@ -38,6 +43,7 @@ public static void Terminate()
                 }
 
                 _instance.TerminateInternal();
+                _instance = null;
             }
         }
 
@@ -232,8 +238,6 @@ private void ProjectReferenceRemovedHandler(object sender, ReferenceEventArgs e)
 
         public event EventHandler EventsTerminated;
 
-        private long _terminated;
-        private const long _true = 1;
         public bool Terminated => Interlocked.Read(ref _terminated) == _true;
 
         private void TerminateInternal()