From 92b7ed32db28e57e6f31125650dfbde159d3d877 Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Wed, 18 May 2022 08:51:13 +0200 Subject: [PATCH] CHANGE(client): Don't hard block shortcuts on Wayland In #5307 we disabled global shortcuts on Wayland, but we did it in a way that would prevent anyone from re-enabling the support. Since we have received reports of some users actually making use of the shortcut system on Wayland, even without proper Wayland support, we decided to remove the hard-lock and allow these users to re-enable the shortcuts, if they so want. Fixes #5454 --- src/mumble/GlobalShortcut.cpp | 2 -- src/mumble/GlobalShortcut.ui | 2 +- src/mumble/Settings.cpp | 8 +------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp index 5f5155e394a..23fe3a02b7b 100644 --- a/src/mumble/GlobalShortcut.cpp +++ b/src/mumble/GlobalShortcut.cpp @@ -532,8 +532,6 @@ GlobalShortcutConfig::GlobalShortcutConfig(Settings &st) : ConfigWidget(st) { if (EnvUtils::waylandIsUsed()) { // Our global shortcut system doesn't work with Wayland qlWaylandNote->setVisible(true); - - qgbShortcuts->setEnabled(false); } #endif diff --git a/src/mumble/GlobalShortcut.ui b/src/mumble/GlobalShortcut.ui index af65a45c1a9..55faa57fa11 100644 --- a/src/mumble/GlobalShortcut.ui +++ b/src/mumble/GlobalShortcut.ui @@ -98,7 +98,7 @@ - <html><head/><body><p>Mumble's Global Shortcuts system does currently not work in combination with the Wayland protocol. For more information, visit <a href="https://github.com/mumble-voip/mumble/issues/5257"><span style=" text-decoration: underline; color:#0057ae;">https://github.com/mumble-voip/mumble/issues/5257</span></a>.</p></body></html> + <html><head/><body><p>Mumble's Global Shortcuts system does currently not work properly in combination with the Wayland protocol. For more information, visit <a href="https://github.com/mumble-voip/mumble/issues/5257"><span style=" text-decoration: underline; color:#0057ae;">https://github.com/mumble-voip/mumble/issues/5257</span></a>.</p></body></html> true diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp index 4d2a9551006..e0b576f194b 100644 --- a/src/mumble/Settings.cpp +++ b/src/mumble/Settings.cpp @@ -533,6 +533,7 @@ Settings::Settings() { #ifdef Q_OS_LINUX if (EnvUtils::waylandIsUsed()) { + // Due to the issues we're currently having on Wayland, we disable shortcuts by default bShortcutEnable = false; } #endif @@ -1028,13 +1029,6 @@ void Settings::legacyLoad(const QString &path) { LOAD(bEnableXboxInput, "shortcut/windows/xbox/enable"); LOAD(bEnableUIAccess, "shortcut/windows/uiaccess/enable"); -#ifdef Q_OS_LINUX - if (EnvUtils::waylandIsUsed()) { - // Global shortcuts don't work on Wayland - bShortcutEnable = false; - } -#endif - // Search options LOAD(searchForUsers, "search/search_for_users"); LOAD(searchForChannels, "search/search_for_channels");