Merge pull request #3695 from cfillion/fix-hyprland-crashes

Fix a crash after handling SIGINT and a data race when initializing the Hyprland workspace modules
Alexays · Oct 21, 2024 · dacecb9 · dacecb9
2 parents 280f11e + 92242f0
commit dacecb9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -107,6 +107,10 @@ int main(int argc, char* argv[]) {
       ret = client->main(argc, argv);
     } while (reload);
 
+    std::signal(SIGUSR1, SIG_IGN);
+    std::signal(SIGUSR2, SIG_IGN);
+    std::signal(SIGINT,  SIG_IGN);
+
     delete client;
     return ret;
   } catch (const std::exception& e) {

diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
@@ -18,6 +18,9 @@ namespace waybar::modules::hyprland {
 std::filesystem::path IPC::socketFolder_;
 
 std::filesystem::path IPC::getSocketFolder(const char* instanceSig) {
+  static std::mutex folderMutex;
+  std::unique_lock lock(folderMutex);
+
   // socket path, specified by EventManager of Hyprland
   if (!socketFolder_.empty()) {
     return socketFolder_;