From b93fd523aa70e4f29a413e085db83518fcc2bd2d Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sat, 22 Jun 2024 12:57:09 +0200 Subject: [PATCH] fix: Remove last remaining getDefaultPaths --- main/gui/source/window/linux_window.cpp | 3 ++- tests/plugins/source/plugins.cpp | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/main/gui/source/window/linux_window.cpp b/main/gui/source/window/linux_window.cpp index 75f3c47fe..aabbbf8dc 100644 --- a/main/gui/source/window/linux_window.cpp +++ b/main/gui/source/window/linux_window.cpp @@ -9,6 +9,7 @@ #include #include #include + #include #include @@ -87,7 +88,7 @@ namespace hex { log::impl::enableColorPrinting(); // Add plugin library folders to dll search path - for (const auto &path : hex::fs::getDefaultPaths(fs::ImHexPath::Libraries)) { + for (const auto &path : paths::Libraries.read()) { if (std::fs::exists(path)) setenv("LD_LIBRARY_PATH", hex::format("{};{}", hex::getEnvironmentVariable("LD_LIBRARY_PATH").value_or(""), path.string().c_str()).c_str(), true); } diff --git a/tests/plugins/source/plugins.cpp b/tests/plugins/source/plugins.cpp index bc85a2988..d80268ce6 100644 --- a/tests/plugins/source/plugins.cpp +++ b/tests/plugins/source/plugins.cpp @@ -1,12 +1,14 @@ #include #include +#include + using namespace hex; class PluginLoader { public: PluginLoader() { - for (const auto &dir : fs::getDefaultPaths(fs::ImHexPath::Plugins)) { + for (const auto &dir : paths::Plugins.read()) { PluginManager::addLoadPath(dir); }