Only bind shortcuts if no shortcuts foundHEAD5.7.2master

3 files changed, 5 insertions, 3 deletions

diff --git a/meson.build b/meson.build
index 5ec5848..0c5cc64 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('gpu-screen-recorder-gtk', ['c', 'cpp'], version : '5.7.1', default_options : ['warning_level=2'])
+project('gpu-screen-recorder-gtk', ['c', 'cpp'], version : '5.7.2', default_options : ['warning_level=2'])
 
 add_project_arguments('-Wshadow', language : ['c', 'cpp'])
 if get_option('buildtype') == 'debug'
diff --git a/project.conf b/project.conf
index 65280dd..9a250d7 100644
--- a/project.conf
+++ b/project.conf
@@ -1,7 +1,7 @@
 [package]
 name = "gpu-screen-recorder-gtk"
 type = "executable"
-version = "5.7.1"
+version = "5.7.2"
 platforms = ["posix"]
 
 [config]
diff --git a/src/main.cpp b/src/main.cpp
index 0c98bcb..369eb93 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -169,6 +169,7 @@ static AppIndicator *app_indicator;
 
 static gsr_global_shortcuts global_shortcuts;
 static bool global_shortcuts_initialized = false;
+static bool global_shortcuts_received = false;
 
 struct AudioInput {
     std::string name;
@@ -1469,6 +1470,7 @@ static void replace_meta_with_super(std::string &str) {
 
 static void shortcut_changed_callback(gsr_shortcut shortcut, void *userdata) {
     (void)userdata;
+    global_shortcuts_received = true;
     std::string trigger = shortcut.trigger_description;
     replace_meta_with_super(trigger);
     for(int i = 0; i < num_hotkeys; ++i) {
@@ -1518,7 +1520,7 @@ static void register_global_shortcuts_once() {
     // On KDE plasma the shortcut menu popup will show up everytime this is used, so we dont want to call it everytime.
     // On Hyprland the global shortcut desktop portal is broken on older versions and crashes the desktop portal.
     // On GNOME this needs to be called everytime to register the shortcuts. The shortcut popup menu will show the first time only.
-    if(wayland_compositor == WaylandCompositor::UNKNOWN && !registered) {
+    if(wayland_compositor == WaylandCompositor::UNKNOWN && !registered && !global_shortcuts_received) {
         registered = true;
         on_register_hotkeys_button_clicked(nullptr, nullptr);
     }