diff options
| author | Robert Adam <dev@robert-adam.de> | 2022-01-12 16:33:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-12 16:33:38 +0300 |
| commit | d5cb83f32d80879955febd027770efbd8e4c1ea5 (patch) | |
| tree | eff7202cfb6600c89ca76bb47eec98a0a4fbe648 | |
| parent | 91c6fcd5cbae2af195e679490969d06e3d32f545 (diff) | |
| parent | 0c769d87a1d9782e2e77c75ba9c34ee3ea5cc3cc (diff) | |
Merge PR #5417: BUILD(audiowizard): Fix build with -Dspeechd=OFF -Dwarnings-as-errors=ON
Move the declaration/definition of `iMessage` to where it is used,
otherwise the build fails with
```
src/mumble/AudioWizard.cpp:95:10: error: variable 'iMessage' set but not used [-Werror,-Wunused-but-set-variable]
quint32 iMessage = Settings::LogNone;
^
1 error generated.
```
Build-tested on OpenBSD 7.0-CURRENT using
```
$ cc --version
OpenBSD clang version 13.0.0
Target: amd64-unknown-openbsd7.0
Thread model: posix
InstalledDir: /usr/bin
```
| -rw-r--r-- | src/mumble/AudioWizard.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mumble/AudioWizard.cpp b/src/mumble/AudioWizard.cpp index 13567dff4..44c4740ae 100644 --- a/src/mumble/AudioWizard.cpp +++ b/src/mumble/AudioWizard.cpp @@ -92,11 +92,6 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) { else qrbQualityCustom->setChecked(true); - quint32 iMessage = Settings::LogNone; - for (int i = Log::firstMsgType; i <= Log::lastMsgType; ++i) { - iMessage |= (Global::get().s.qmMessages[i] & (Settings::LogSoundfile | Settings::LogTTS)); - } - #ifdef USE_NO_TTS qrbNotificationCustom->setChecked(false); qrbNotificationCustom->setDisabled(true); @@ -104,6 +99,11 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) { qrbNotificationTTS->setDisabled(true); qrbNotificationSounds->setChecked(true); #else + quint32 iMessage = Settings::LogNone; + for (int i = Log::firstMsgType; i <= Log::lastMsgType; ++i) { + iMessage |= (Global::get().s.qmMessages[i] & (Settings::LogSoundfile | Settings::LogTTS)); + } + if (iMessage == Settings::LogTTS && Global::get().s.bTTS) qrbNotificationTTS->setChecked(true); else if (iMessage == Settings::LogSoundfile) |