Merge pull request bigbluebutton#21058 from KDSBrowne/v30-ptt-update

fix: Push to talk intercepting shortcut with modifier
aqtoor · Aug 29, 2024 · 1eafe4b · 1eafe4b
2 parents 67e0caa + 8a0231a
commit 1eafe4b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...ents/audio/audio-graphql/audio-controls/input-stream-live-selector/buttons/muteToggle.tsx b/...ents/audio/audio-graphql/audio-controls/input-stream-live-selector/buttons/muteToggle.tsx
@@ -75,9 +75,14 @@ export const MuteToggle: React.FC<MuteToggleProps> = ({
         || activeElement.isContentEditable);
     const Settings = getSettingsSingletonInstance();
     const pushToTalkEnabled = Settings?.application?.pushToTalkEnabled;
-    if ((cooldownActive.current || event.key !== 'm' || isInputField) || !pushToTalkEnabled) {
-      return;
-    }
+    if (
+      !pushToTalkEnabled
+        || cooldownActive.current
+        || event.key !== 'm'
+        || event.altKey
+        || event.ctrlKey
+        || isInputField
+    ) return;
 
     if (action === 'down' && !isKeyDown.current) {
       isKeyDown.current = true;