From 55e04dd520339f38aa5b18b21a8b91148772e4b5 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sat, 3 Dec 2022 05:29:39 +0100
Subject: [PATCH] Player: Fix volume adjustment

---
 src/core/player.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core/player.cpp b/src/core/player.cpp
index 2d4c20ed0..1c5a6d370 100644
--- a/src/core/player.cpp
+++ b/src/core/player.cpp
@@ -649,8 +649,9 @@ void Player::SetVolumeFromSlider(const int value) {
 
   const uint volume = static_cast<uint>(qBound(0, value, 100));
   if (volume != volume_) {
+    volume_ = volume;
     engine_->SetVolume(volume);
-    emit VolumeChanged(volume_);
+    emit VolumeChanged(volume);
   }
 
 }
@@ -660,7 +661,7 @@ void Player::SetVolumeFromEngine(const uint volume) {
   const uint new_volume = qBound(0U, volume, 100U);
   if (new_volume != volume_) {
     volume_ = new_volume;
-    emit VolumeChanged(volume_);
+    emit VolumeChanged(new_volume);
   }
 
 }
@@ -669,11 +670,11 @@ void Player::SetVolume(const uint volume) {
 
   const uint new_volume = qBound(0U, volume, 100U);
   if (new_volume != volume_) {
-    engine_->SetVolume(volume);
     volume_ = new_volume;
-    emit VolumeChanged(volume_);
+    engine_->SetVolume(new_volume);
+    emit VolumeChanged(new_volume);
   }
-  
+
 }
 
 void Player::VolumeUp() {