Fix PopupList when already IntelliSense loaded late

IntelliSenseServer v 0.0.4

Author: govert

Source/ExcelDna.IntelliSense/IntelliSenseServer.cs

@@ -47,7 +47,7 @@ namespace ExcelDna.IntelliSense
     // REMEMBER: COM events are not necessarily safe macro contexts.
     public static class IntelliSenseServer
     {
-        const string ServerVersion = "0.0.3";  // TODO: Define and manage this somewhere else
+        const string ServerVersion = "0.0.4";  // TODO: Define and manage this somewhere else
 
         // NOTE: Do not change these constants in custom versions. 
         //       They are part of the co-operative safety mechanism allowing different add-ins providing IntelliSense to work together safely.

Source/ExcelDna.IntelliSense/UIMonitor/PopupListWatcher.cs

@@ -57,7 +57,8 @@ void _windowWatcher_PopupListWindowChanged(object sender, WindowWatcher.WindowCh
                     try
                     {
                         // DO we need to remove...?
-                        Automation.RemoveAutomationPropertyChangedEventHandler(_popupList, PopupListBoundsChanged);
+                        if (_popupList != null)
+                            Automation.RemoveAutomationPropertyChangedEventHandler(_popupList, PopupListBoundsChanged);
                     }
                     catch (Exception ex)
                     {
@@ -74,6 +75,7 @@ void _windowWatcher_PopupListWindowChanged(object sender, WindowWatcher.WindowCh
                     if (_popupList == null)
                     {
                         Logger.WindowWatcher.Verbose($"PopupList automation initialize");
+                        _hwndPopupList = e.WindowHandle;
                         _popupList = AutomationElement.FromHandle(_hwndPopupList);
                         // We set up the structure changed handler so that we can catch the sub-list creation
                         InstallEventHandlers();