Bugfix/4.1.1 (#161)

* - Fixed `cannot read property of undefined` error because of not passing mainWindow around.
- vincens2005, fixed inconsistent auto muting

* Fix inconsistent auto-muting (#159)

* fix muting sometimes not working

* fix inconsistent unmuting

* fix bad code in inconsistent muting fig

Co-authored-by: Cukmekerb <cukmekerb@gmail.com>

src/main.js

@@ -136,7 +136,7 @@ app.on("ready", async () => {
   if (isMainInstanceOrMultipleInstancesAllowed()) {
     await components.whenReady();
     createWindow();
-    addMenu();
+    addMenu(mainWindow);
     createSettingsWindow();
     addGlobalShortcuts();
     store.get(settings.trayIcon) && addTray(mainWindow, { icon }) && refreshTray();

src/preload.js

@@ -12,7 +12,7 @@ const appName = "Tidal Hifi";
 let currentSong = "";
 let player;
 let currentPlayStatus = statuses.paused;
-let isMutedArtist = false;
+let isMutedArtist = true;
 
 const elements = {
   play: '*[data-test="play"]',
@@ -327,6 +327,8 @@ function getTrackURL() {
 setInterval(function () {
   const title = elements.getText("title");
   const artists = elements.getArtists();
+  muteArtistIfFoundInMutedArtistsList(); // doing this here so that nothing can possibly fail before we call this function
+  
   const album = elements.getAlbumName();
   const current = elements.getText("current");
   const duration = elements.getText("duration");
@@ -342,10 +344,11 @@ setInterval(function () {
     duration,
     "app-name": appName,
   };
+  
+
 
   const titleOrArtistChanged = currentSong !== songDashArtistTitle;
 
-  muteArtistIfFoundInMutedArtistsList();
 
   // update title, url and play info with new info
   setTitle(songDashArtistTitle);
@@ -390,7 +393,7 @@ setInterval(function () {
           isMutedArtist = true;
           elements.click("volume");
         }
-      } else if (currentStatus === statuses.playing && isMutedArtist && elements.isMuted()) {
+      } else if (isMutedArtist && elements.isMuted()) {
         elements.click("volume");
         isMutedArtist = false;
       }

src/scripts/menu.js

@@ -115,8 +115,8 @@ menuModule.getMenu = function (mainWindow) {
   return Menu.buildFromTemplate(mainMenu);
 };
 
-menuModule.addMenu = function () {
-  Menu.setApplicationMenu(menuModule.getMenu());
+menuModule.addMenu = function (mainWindow) {
+  Menu.setApplicationMenu(menuModule.getMenu(mainWindow));
 };
 
 module.exports = menuModule;