fix(linux): clear shortcuts instead of replacing it (#724)

tauri-apps · Apr 18, 2023 · ee5dc41 · ee5dc41
1 parent 9f271f1
commit ee5dc41
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.changes/clear-shortuts-linux.md b/.changes/clear-shortuts-linux.md
@@ -0,0 +1,5 @@
+---
+"tao": "patch"
+---
+
+On Linux, fix `ShortcutManager::unregister_all` making `ShortcutManager::register` succeed but no events are triggered.
diff --git a/src/platform_impl/linux/global_shortcut.rs b/src/platform_impl/linux/global_shortcut.rs
@@ -231,13 +231,14 @@ impl ShortcutManager {
   }
 
   pub(crate) fn unregister_all(&mut self) -> Result<(), ShortcutManagerError> {
-    for (found_id, _) in self.shortcuts.lock().unwrap().iter() {
+    let mut shortcuts = self.shortcuts.lock().unwrap();
+    for (found_id, _) in shortcuts.iter() {
       self
         .method_sender
         .send(HotkeyMessage::UnregisterHotkey(*found_id))
         .map_err(|_| ShortcutManagerError::InvalidAccelerator("Channel error".into()))?;
     }
-    self.shortcuts = ListenerMap::default();
+    shortcuts.clear();
     Ok(())
   }