cache: fix crash on release build

Author: Toni500github

include/cache.hpp

@@ -21,8 +21,6 @@ struct cache_entry_t
     toml::table       tbl = {};
 };
 
-extern std::unordered_map<CacheFilesEnum, cache_entry_t> g_cache_files;
-
 class Cache
 {
 public:
@@ -84,8 +82,14 @@ class Cache
         }
     }
 
+    std::unordered_map<CacheFilesEnum, cache_entry_t>& GetEntries() { return m_cache_entries; }
+
 private:
     std::string m_cache_dir_path;
+
+    std::unordered_map<CacheFilesEnum, cache_entry_t> m_cache_entries = {
+        { CacheFilesEnum::Colors, { "colors.toml", "cache.default-color-picker-color" } }
+    };
 };
 
 extern std::unique_ptr<Cache> g_cache;

include/screenshot_tool.hpp

@@ -135,7 +135,7 @@ class ScreenshotTool
     ScreenshotTool()
         : m_io(dummy),
           m_inputs{ g_config->File.ocr_path, g_config->File.ocr_model, {}, "", {}, "", "" },
-          m_current_color(rgba_t(Cache::GetValue(g_cache_files[CacheFilesEnum::Colors], 0xFF0000FF)))
+          m_current_color(rgba_t(Cache::GetValue(g_cache->GetEntries()[CacheFilesEnum::Colors], 0xFF0000FF)))
     {}
 
     Result<>          Start();

src/cache.cpp

@@ -8,32 +8,23 @@
 #include "toml++/toml.hpp"
 #include "util.hpp"
 
-std::unordered_map<CacheFilesEnum, cache_entry_t> g_cache_files = {
-    { CacheFilesEnum::Colors, { "colors.toml", "cache.default-color-picker-color" } }
-};
-
-static fs::path old_pwd;
-static void     cd(const fs::path& path)
+struct CdGuard
 {
-    if (!path.empty())
+    fs::path saved;
+    CdGuard(const fs::path& p) : saved(fs::current_path())
     {
-        old_pwd = fs::current_path();
-        fs::current_path(path);
+        if (!p.empty())
+            fs::current_path(p);
     }
-}
-
-static void cd_back()
-{
-    if (!old_pwd.empty())
-        fs::current_path(old_pwd);
-}
+    ~CdGuard() { fs::current_path(saved); }
+};
 
 // https://github.com/hyprwm/Hyprland/blob/2d2a5bebff72c73cd27db3b9e954b8fa2a7623e8/hyprpm/src/core/DataState.cpp#L24
 static bool write_cache(const std::string& str, const std::string& to)
 {
     // create temp file in a safe temp root
-    const fs::path& temp_state = (fs::temp_directory_path() / ".temp-state");
-    std::ofstream   of(temp_state, std::ios::trunc);
+    const fs::path temp_state = (fs::temp_directory_path() / ".temp-state");
+    std::ofstream  of(temp_state, std::ios::trunc);
     if (!of.good())
         return false;
 
@@ -52,12 +43,12 @@ Cache::Cache(const std::string& cache_dir) : m_cache_dir_path(cache_dir)
     }
 
     for (int i = 0; i < int(idx(CacheFilesEnum::COUNT)); ++i)
-        LoadCacheFile(g_cache_files[enum_<CacheFilesEnum>(i)]);
+        LoadCacheFile(m_cache_entries[enum_<CacheFilesEnum>(i)]);
 }
 
 Cache::~Cache()
 {
-    for (const auto& [_, cache] : g_cache_files)
+    for (const auto& [_, cache] : m_cache_entries)
         GenerateCacheFile(cache);
 }
 
@@ -66,7 +57,7 @@ Result<> Cache::LoadCacheFile(cache_entry_t& entry)
     // Since the filename (default.theme-file) will be likely
     // related to relative path of the config directory, let's
     // snapshot and switch to that directory.
-    cd(m_cache_dir_path);
+    CdGuard guard(m_cache_dir_path);
 
     if (fs::exists(entry.file_path))
     {
@@ -76,8 +67,6 @@ Result<> Cache::LoadCacheFile(cache_entry_t& entry)
         }
         catch (const toml::parse_error& err)
         {
-            // Snap back
-            cd_back();
             return Err(
                 fmt::format("Parsing cache file '{}' failed:\n"
                             "{}\n"
@@ -89,13 +78,12 @@ Result<> Cache::LoadCacheFile(cache_entry_t& entry)
         }
     }
 
-    cd_back();
     return Ok();
 }
 
 void Cache::GenerateCacheFile(const cache_entry_t& entry)
 {
-    cd(m_cache_dir_path);
+    CdGuard guard(m_cache_dir_path);
 
     std::stringstream ss;
     ss << "# AUTO-GENERATED FILE. DO NOT EDIT THIS FILE.\n";
@@ -104,5 +92,4 @@ void Cache::GenerateCacheFile(const cache_entry_t& entry)
 
     if (!write_cache(ss.str(), entry.file_path))
         error("Failed to write cache entry at path '{}'", entry.file_path);
-    cd_back();
 }

src/screenshot_tool.cpp

@@ -1385,7 +1385,7 @@ void ScreenshotTool::DrawBarDecodeTools()
 
 void ScreenshotTool::DrawAnnotationToolbar()
 {
-    cache_entry_t&               cache_entry      = g_cache_files[CacheFilesEnum::Colors];
+    cache_entry_t&               cache_entry      = g_cache->GetEntries()[CacheFilesEnum::Colors];
     static int                   item_picker      = 0;
     static constexpr const char* color_pickers[2] = { "Bar - Square", "Wheel - Triangle" };