diff options
Diffstat (limited to 'src/mumble/Settings.cpp')
| -rw-r--r-- | src/mumble/Settings.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp index 475e5eea4..86650c099 100644 --- a/src/mumble/Settings.cpp +++ b/src/mumble/Settings.cpp @@ -7,6 +7,7 @@ #include "AudioInput.h" #include "Cert.h" +#include "EnvUtils.h" #include "Log.h" #include "SSL.h" #include "Global.h" @@ -532,6 +533,12 @@ Settings::Settings() { bEnableXboxInput = true; bEnableUIAccess = true; +#ifdef Q_OS_LINUX + if (EnvUtils::waylandIsUsed()) { + bShortcutEnable = false; + } +#endif + for (int i = Log::firstMsgType; i <= Log::lastMsgType; ++i) { qmMessages.insert(i, Settings::LogConsole | Settings::LogBalloon | Settings::LogTTS | Settings::LogMessageLimit); @@ -1007,6 +1014,13 @@ void Settings::load(QSettings *settings_ptr) { 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"); |