From 39d8c169c981ab4685aeb403b31a42c22b7680b0 Mon Sep 17 00:00:00 2001 From: micha4w Date: Fri, 3 Nov 2023 14:17:36 +0100 Subject: [PATCH 1/3] fix executeCommand logs --- src/util.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util.cpp b/src/util.cpp index 352da0e..b8032f5 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -198,9 +198,9 @@ namespace hyprload { int exit = pclose(pipe); - Debug::log(LOG, " [hyprload] Command: %s", command.c_str()); - Debug::log(LOG, " [hyprload] Exit code: %d", exit); - Debug::log(LOG, " [hyprload] Result: %s", result.c_str()); + Debug::log(LOG, " [hyprload] Command: {}", command.c_str()); + Debug::log(LOG, " [hyprload] Exit code: {}", exit); + Debug::log(LOG, " [hyprload] Result: {}", result.c_str()); return std::make_tuple(exit, result); } From 1fead6d403b74cd980ddd3043af3ba043fbb8102 Mon Sep 17 00:00:00 2001 From: micha4w Date: Fri, 3 Nov 2023 14:18:23 +0100 Subject: [PATCH 2/3] fix setupHeader error message being ignored --- src/Hyprload.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Hyprload.cpp b/src/Hyprload.cpp index 0ff940d..b7d0b9f 100644 --- a/src/Hyprload.cpp +++ b/src/Hyprload.cpp @@ -122,7 +122,7 @@ namespace hyprload { auto lock = std::unique_lock(descriptor->m_mMutex); descriptor->m_rResult = hyprload::Result::err( - "Failed to setup Hyprland headers"); + "Failed to setup Hyprland headers: " + g_bHeadersReady.value().unwrapErr()); return; } @@ -203,7 +203,7 @@ namespace hyprload { auto lock = std::unique_lock(descriptor->m_mMutex); descriptor->m_rResult = hyprload::Result::err( - "Failed to setup Hyprland headers"); + "Failed to setup Hyprland headers: " + g_bHeadersReady.value().unwrapErr()); return; } @@ -271,7 +271,7 @@ namespace hyprload { auto lock = std::unique_lock(descriptor->m_mMutex); descriptor->m_rResult = hyprload::Result::err( - "Failed to setup Hyprland headers"); + "Failed to setup Hyprland headers: " + g_bHeadersReady.value().unwrapErr()); return; } From 6717dda505e0abe53b143d20e893b096d5e00dc0 Mon Sep 17 00:00:00 2001 From: micha4w Date: Fri, 3 Nov 2023 14:18:45 +0100 Subject: [PATCH 3/3] fix clearPlugins using wrong path --- src/Hyprload.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Hyprload.cpp b/src/Hyprload.cpp index b7d0b9f..ec54d14 100644 --- a/src/Hyprload.cpp +++ b/src/Hyprload.cpp @@ -592,7 +592,7 @@ namespace hyprload { continue; } - pluginFiles.push_back(plugin); + pluginFiles.push_back(pluginPath); } for (auto& plugin : pluginFiles) {