From a23bb9a6a5ff31e159e66d3033ee95a8c46add1d Mon Sep 17 00:00:00 2001
From: Jason Chen <californiaroad1@gmail.com>
Date: Wed, 19 Jan 2022 20:47:27 -0800
Subject: [PATCH] fixed volume condition (last commit broke it)

---
 src/renderer/index.js                        | 11 +++++------
 src/renderer/views/components/fullscreen.ejs |  2 +-
 src/renderer/views/main.ejs                  |  6 ++++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/renderer/index.js b/src/renderer/index.js
index 9ecc5aab..91f2c339 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -709,10 +709,6 @@ const app = new Vue({
 
 
             this.mk.addEventListener(MusicKit.Events.playbackVolumeDidChange, (_a) => {
-                if( this.cfg.audio.muted && this.cfg.audio.lastVolume != 0 ) {
-                    this.cfg.audio.muted = false;
-                    this.cfg.audio.lastVolume = 0;
-                }
                 this.cfg.audio.volume = this.mk.volume
             })
 
@@ -3013,7 +3009,6 @@ const app = new Vue({
         muteButtonPressed() {
             if( this.cfg.audio.muted ) {
                 this.mk.volume = this.cfg.audio.lastVolume;
-                this.cfg.lastVolume = 0;
                 this.cfg.audio.muted = false;
             } else {
                 this.cfg.audio.lastVolume = this.cfg.audio.volume;
@@ -3021,7 +3016,11 @@ const app = new Vue({
                 this.cfg.audio.muted = true;
             }
         },
-
+        checkMuteChange() {
+            if( this.cfg.audio.muted ) {
+                this.cfg.audio.muted = false;
+            }
+        },
         async apiCall(url, callback) {
             const xmlHttp = new XMLHttpRequest();
 
diff --git a/src/renderer/views/components/fullscreen.ejs b/src/renderer/views/components/fullscreen.ejs
index 2c0e8257..b93a27e5 100644
--- a/src/renderer/views/components/fullscreen.ejs
+++ b/src/renderer/views/components/fullscreen.ejs
@@ -81,7 +81,7 @@
                         <div class="input-container">
                         <button class="volume-button--small volume" @click="app.muteButtonPressed()" :class="{'active': app.cfg.audio.volume == 0}"></button>
                         <input type="range" class="slider" @wheel="app.volumeWheel" step="0.01" min="0" max="1" v-model="app.mk.volume"
-                               v-if="typeof app.mk.volume != 'undefined'">
+                               v-if="typeof app.mk.volume != 'undefined'" @change="app.checkMuteChange()">
                         </div>       
                     </div>
                     </div>
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index 180d6c30..91ea36a5 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -134,7 +134,8 @@
                         <button class="volume-button--small volume" @click="muteButtonPressed()" :class="{'active': this.cfg.audio.volume == 0}"></button>
                         <input type="range" class="" @wheel="volumeWheel" step="0.01" min="0" max="1"
                                v-model="mk.volume"
-                               v-if="typeof mk.volume != 'undefined'">
+                               v-if="typeof mk.volume != 'undefined'"
+                               @change="checkMuteChange()">
                     </div>
                     <div class="app-chrome-item generic" v-if="false">
                         <button class="playback-button--small">
@@ -298,7 +299,8 @@
                                     <button class="volume-button--small volume" @click="muteButtonPressed()" :class="{'active': this.cfg.audio.volume == 0}"></button>
                                     <input type="range" class="" @wheel="volumeWheel" step="0.01" min="0" max="1"
                                            v-model="mk.volume"
-                                           v-if="typeof mk.volume != 'undefined'">
+                                           v-if="typeof mk.volume != 'undefined'"
+                                           @change="checkMuteChange()">
                                 </div>
                             </div>
                         </div>