Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into SourceControlLogging

Author: Hosch250

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -216,9 +216,23 @@ private IntPtr WindowProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam)
             try
             {
                 var suppress = false;
-                if (hWnd == _mainWindowHandle && (WM)uMsg == WM.HOTKEY)
+                switch ((WM) uMsg)
                 {
-                    suppress = HandleHotkeyMessage(wParam);
+                    case WM.HOTKEY:
+                        suppress = hWnd == _mainWindowHandle && HandleHotkeyMessage(wParam);
+                        break;
+                    case WM.SETFOCUS:
+                        Attach();
+                        break;
+                    case WM.NCACTIVATE:                   
+                        if (wParam == IntPtr.Zero)
+                        {
+                            Detach();
+                        }
+                        break;
+                    case WM.CLOSE:
+                        Detach();
+                        break;
                 }
 
                 return suppress