FZ: fix currently selected zone tracking (#8797)

microsoft · Dec 29, 2020 · 16e4c34 · 16e4c34
1 parent 4f594c9
commit 16e4c34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/modules/fancyzones/dll/dllmain.cpp b/src/modules/fancyzones/dll/dllmain.cpp
@@ -210,11 +210,11 @@ class FancyZonesModule : public PowertoyModuleIface
     //contains the non localized key of the powertoy
     std::wstring app_key;
 
-    static inline FancyZonesModule* s_instance;
-    static inline HHOOK s_llKeyboardHook;
+    static inline FancyZonesModule* s_instance = nullptr;
+    static inline HHOOK s_llKeyboardHook = nullptr;
 
     std::vector<HWINEVENTHOOK> m_staticWinEventHooks;
-    HWINEVENTHOOK m_objectLocationWinEventHook;
+    HWINEVENTHOOK m_objectLocationWinEventHook = nullptr;
 
     static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
     {

diff --git a/src/modules/fancyzones/lib/GenericKeyHook.h b/src/modules/fancyzones/lib/GenericKeyHook.h
@@ -39,7 +39,7 @@ class GenericKeyHook
     }
 
 private:
-    inline static HHOOK hHook;
+    inline static HHOOK hHook = nullptr;
     inline static std::function<void(bool)> callback;
 
     static LRESULT CALLBACK GenericKeyHookProc(int nCode, WPARAM wParam, LPARAM lParam)