fix coverity defeats

pit-ray · Feb 11, 2024 · 84678b2 · 84678b2
1 parent 12beb6c
commit 84678b2
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/include/fluent_tray.hpp b/include/fluent_tray.hpp
@@ -122,6 +122,15 @@ namespace fluent_tray
             auto b = GetBValue(rgb) ;
             return static_cast<unsigned char>(0.2126 * r + 0.7152 * g + 0.0722 * b) ;
         }
+
+        inline bool exists(const std::filesystem::path& fs) noexcept {
+            try {
+                return std::filesystem::exists(fs) ;
+            }
+            catch(const std::filesystem::filesystem_error&) {
+                return false ;
+            }
+        }
     }
 
     enum class TrayStatus : unsigned char
@@ -223,7 +232,7 @@ namespace fluent_tray
                 WPARAM(MAKELONG(UIS_SET, UISF_HIDEFOCUS)), 0) ;
 
             if(!icon_path.empty()) {
-                if(!std::filesystem::exists(icon_path)) {
+                if(!exists(icon_path)) {
                     return false ;
                 }
 
@@ -660,23 +669,15 @@ namespace fluent_tray
                 auto& menu = menus_[i] ;
                 if(menu.is_mouse_over()) {
                     if(!mouse_is_over_[i]) {
-                        if(!menu.set_color(
-                                text_color_, ash_color_, ash_color_)) {
-                            return false ;
-                        }
-                        if(!InvalidateRect(menu.window_handle(), NULL, TRUE)) {
+                        if(!change_menu_back_color(menu, ash_color_)) {
                             return false ;
                         }
                     }
                     mouse_is_over_[i] = true ;
                 }
                 else {
                     if(mouse_is_over_[i]) {
-                        if(!menu.set_color(
-                                text_color_, back_color_, ash_color_)) {
-                            return false ;
-                        }
-                        if(!InvalidateRect(menu.window_handle(), NULL, TRUE)) {
+                        if(!change_menu_back_color(menu, back_color_)) {
                             return false ;
                         }
                     }
@@ -731,7 +732,7 @@ namespace fluent_tray
                 return true ;
             }
 
-            if(!std::filesystem::exists(icon_path)) {
+            if(!exists(icon_path)) {
                 return false ;
             }
 
@@ -1120,6 +1121,18 @@ namespace fluent_tray
         void fail() noexcept {
             status_ = TrayStatus::FAILED ;
         }
+
+        bool change_menu_back_color(FluentMenu& menu, COLORREF new_color) {
+            if(!menu.set_color(
+                    text_color_, new_color, ash_color_)) {
+                return false ;
+            }
+            // Redraw
+            if(!InvalidateRect(menu.window_handle(), NULL, TRUE)) {
+                return false ;
+            }
+            return true ;
+        }
     } ;
 }