Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
child_duckling 2022-03-04 22:54:32 -08:00
commit d533c4a396
2 changed files with 5 additions and 2 deletions

View file

@ -3533,7 +3533,7 @@ const app = new Vue({
return event.deltaY < 0;
},
volumeUp() {
if ((app.mk.volume + app.cfg.audio.volumeStep) > 1) {
if ((app.mk.volume + app.cfg.audio.volumeStep) > app.cfg.audio.maxVolume) {
app.mk.volume = app.cfg.audio.maxVolume;
console.log('setting max volume')
} else {