diff options
author | Alex Yatskov <alex@foosoft.net> | 2017-04-01 12:09:40 -0700 |
---|---|---|
committer | Alex Yatskov <alex@foosoft.net> | 2017-04-01 12:09:40 -0700 |
commit | 681470db67fc4fa706e2d29ee5beb54859fe5567 (patch) | |
tree | 9e818516591765b38fbcb304479886b8b6c6f04d /ext/mixed/js | |
parent | f7e47d1dbd1f9a7d42af2cecc4de8d078b062a89 (diff) | |
parent | 4eb3e2f06cd83ef0721557f8559fc0a6d70ad4f5 (diff) |
Merge branch 'master' into firefox-amo
Diffstat (limited to 'ext/mixed/js')
-rw-r--r-- | ext/mixed/js/display.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js index 9738319a..36609525 100644 --- a/ext/mixed/js/display.js +++ b/ext/mixed/js/display.js @@ -343,6 +343,7 @@ class Display { let audio = this.audioCache[url]; if (audio) { audio.currentTime = 0; + audio.volume = this.options.general.audioVolume / 100.0; audio.play(); } else { audio = new Audio(url); @@ -352,6 +353,7 @@ class Display { } this.audioCache[url] = audio; + audio.volume = this.options.general.audioVolume / 100.0; audio.play(); }; } |