Skip to content

Commit

Permalink
Merge branch 'mumble-voip:master' into no-boost
Browse files Browse the repository at this point in the history
  • Loading branch information
g-virus-dev authored Feb 27, 2025
2 parents 38212d9 + 3e56558 commit b6ddb85
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/mumble/AudioPreprocessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#ifndef MUMBLE_MUMBLE_AUDIOPREPROCESSOR_H_
#define MUMBLE_MUMBLE_AUDIOPREPROCESSOR_H_

#include <cstddef>
#include <cstdint>
#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion src/mumble/LookConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ void LookConfig::themeDirectoryChanged() {
}

void LookConfig::on_qcbAbbreviateChannelNames_stateChanged(int state) {
bool abbreviateNames = state == Qt::Checked;
bool abbreviateNames = (state == Qt::Checked) || (state == Qt::PartiallyChecked);

// Only enable the abbreviation related settings if abbreviation is actually enabled
qcbAbbreviateCurrentChannel->setEnabled(abbreviateNames);
Expand Down

0 comments on commit b6ddb85

Please sign in to comment.