Skip to content

Commit

Permalink
Backport "Merge PR #6486: FIX(client): Do not spam log when adjusting…
Browse files Browse the repository at this point in the history
… volume of clients without certificate" to 1.5.x (#6488)
Hartmnt authored Jul 8, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 63d3c53 + 93508f2 commit 9b54c05
Showing 2 changed files with 9 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/mumble/UserLocalVolumeSlider.cpp
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
#include "Global.h"

UserLocalVolumeSlider::UserLocalVolumeSlider(QWidget *parent) : VolumeSliderWidgetAction(parent) {
connect(m_volumeSlider, &QSlider::sliderReleased, this, &UserLocalVolumeSlider::on_VolumeSlider_sliderReleased);
}

void UserLocalVolumeSlider::setUser(unsigned int sessionId) {
@@ -40,10 +41,15 @@ void UserLocalVolumeSlider::on_VolumeSlider_changeCompleted() {
if (user) {
if (!user->qsHash.isEmpty()) {
Global::get().db->setUserLocalVolume(user->qsHash, user->getLocalVolumeAdjustments());
} else {
Global::get().mw->logChangeNotPermanent(QObject::tr("Local Volume Adjustment..."), user);
}

updateLabelValue();
}
}

void UserLocalVolumeSlider::on_VolumeSlider_sliderReleased() {
ClientUser *user = ClientUser::get(m_clientSession);
if (user && user->qsHash.isEmpty()) {
Global::get().mw->logChangeNotPermanent(QObject::tr("Local Volume Adjustment..."), user);
}
}
1 change: 1 addition & 0 deletions src/mumble/UserLocalVolumeSlider.h
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ class UserLocalVolumeSlider : public VolumeSliderWidgetAction {
private slots:
void on_VolumeSlider_valueChanged(int value) override;
void on_VolumeSlider_changeCompleted() override;
void on_VolumeSlider_sliderReleased();
};

#endif

0 comments on commit 9b54c05

Please sign in to comment.