From a008d8351436c779992ae92062e917fa12f4ed0a Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sun, 24 Nov 2024 19:39:23 +0100
Subject: Fix getting stuck on shutdown with SIGINT

---
 src/GlobalHotkeysLinux.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/GlobalHotkeysLinux.cpp b/src/GlobalHotkeysLinux.cpp
index 975e585..7b1a412 100644
--- a/src/GlobalHotkeysLinux.cpp
+++ b/src/GlobalHotkeysLinux.cpp
@@ -15,6 +15,12 @@ namespace gsr {
     }
 
     GlobalHotkeysLinux::~GlobalHotkeysLinux() {
+        if(process_id > 0) {
+            kill(process_id, SIGKILL);
+            int status;
+            waitpid(process_id, &status, 0);
+        }
+
         for(int i = 0; i < 2; ++i) {
             if(pipes[i] > 0)
                 close(pipes[i]);
@@ -22,12 +28,6 @@ namespace gsr {
 
         if(read_file)
             fclose(read_file);
-
-        if(process_id > 0) {
-            kill(process_id, SIGKILL);
-            int status;
-            waitpid(process_id, &status, 0);
-        }
     }
 
     bool GlobalHotkeysLinux::start() {
@@ -105,4 +105,4 @@ namespace gsr {
         if(it != bound_actions_by_id.end())
             it->second(action);
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3