Corrected some bugs/oversights

SpecialKO · Jan 25, 2024 · d59c81b · d59c81b
1 parent cbc0e3b
commit d59c81b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/include/utility/utility.h b/include/utility/utility.h
@@ -185,7 +185,7 @@ struct SKIF_DirectoryWatch
 
   void reset           (void);
 
-  HANDLE       _hChangeNotification = INVALID_HANDLE_VALUE;
+  HANDLE       _hChangeNotification = INVALID_HANDLE_VALUE; // If the FindFirstChangeNotification function fails, the return value is INVALID_HANDLE_VALUE.
   UITab        _waitTab             = UITab_None;
   std::wstring _path                = L"";
 
@@ -225,6 +225,6 @@ struct SKIF_RegistryWatch {
   } _init;
 
   HKEY    _hKeyBase    = { };
-  HANDLE  _hEvent      = INVALID_HANDLE_VALUE;
+  HANDLE  _hEvent      = NULL; // If the CreateEvent function fails, the return value is NULL.
   UITab   _waitTab     = UITab_None;
 };
diff --git a/src/utility/utility.cpp b/src/utility/utility.cpp
@@ -3016,6 +3016,9 @@ SKIF_RegistryWatch::reset (void)
 bool
 SKIF_RegistryWatch::isSignaled (void)
 {
+  if (_hEvent == NULL)
+    return false;
+
   bool signaled =
     WaitForSingleObjectEx (
       _hEvent, 0UL, FALSE