kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

fix: prevent volumeChanged recursion (#2320) (#2323)

Browse Source
This commit is contained in:
end-4
2025-10-29 20:21:17 +01:00
committed by GitHub
parent c550a792b8 8eb50a8917
commit cead3c87ea
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dots/.config/quickshell/ii/services/Audio.qml
+8 -5
View File
@@ -29,12 +29,18 @@ Singleton {
property real lastVolume: 0 property real lastVolume: 0
function onVolumeChanged() { function onVolumeChanged() {
if (!Config.options.audio.protection.enable) return; if (!Config.options.audio.protection.enable) return;
const newVolume = sink.audio.volume;
// when resuming from suspend, we should not write volume to avoid pipewire volume reset issues
if (isNaN(newVolume) || newVolume === undefined || newVolume === null) {
lastReady = false;
lastVolume = 0;
return;
}
if (!lastReady) { if (!lastReady) {
lastVolume = sink.audio.volume; lastVolume = newVolume;
lastReady = true; lastReady = true;
return; return;
} }
const newVolume = sink.audio.volume;
const maxAllowedIncrease = Config.options.audio.protection.maxAllowedIncrease / 100; const maxAllowedIncrease = Config.options.audio.protection.maxAllowedIncrease / 100;
const maxAllowed = Config.options.audio.protection.maxAllowed / 100; const maxAllowed = Config.options.audio.protection.maxAllowed / 100;
@@ -45,9 +51,6 @@ Singleton {
root.sinkProtectionTriggered(Translation.tr("Exceeded max allowed")); root.sinkProtectionTriggered(Translation.tr("Exceeded max allowed"));
sink.audio.volume = Math.min(lastVolume, maxAllowed); sink.audio.volume = Math.min(lastVolume, maxAllowed);
} }
if (sink.ready && (isNaN(sink.audio.volume) || sink.audio.volume === undefined || sink.audio.volume === null)) {
sink.audio.volume = 0;
}
lastVolume = sink.audio.volume; lastVolume = sink.audio.volume;
} }
} }