Chore: Guard against none group volume level
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Sat, 1 Feb 2025 17:07:25 +0000 (18:07 +0100)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Sat, 1 Feb 2025 17:07:25 +0000 (18:07 +0100)
music_assistant/controllers/players.py

index 0beeeb03ff950158f8c953d83d17293ca1a3fb9b..c72fde85b55d8ab8bc1cf1b69698aeb4ee0bdc08 100644 (file)
@@ -1366,14 +1366,16 @@ class PlayerController(CoreController):
         """Calculate a group volume from the grouped members."""
         if len(player.group_childs) == 0:
             # player is not a group or syncgroup
-            return player.volume_level
+            return player.volume_level or 0
         # calculate group volume from all (turned on) players
         group_volume = 0
         active_players = 0
         for child_player in self.iter_group_members(player, only_powered=True, exclude_self=False):
             if child_player.volume_control == PLAYER_CONTROL_NONE:
                 continue
-            group_volume += child_player.volume_level or 0
+            if child_player.volume_level is None:
+                continue
+            group_volume += child_player.volume_level
             active_players += 1
         if active_players:
             group_volume = group_volume / active_players