diff --git a/CHANGELOG.md b/CHANGELOG.md index 290c7ea..077138e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 4.1.1 + +- Fixed `cannot read property of undefined` error because of not passing mainWindow around. +- vincens2005, fixed inconsistent auto muting + ## 4.1.0 - Added `tidal://` protocol support diff --git a/package-lock.json b/package-lock.json index 5739fc8..3558a42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tidal-hifi", - "version": "4.1.0", + "version": "4.1.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "tidal-hifi", - "version": "4.1.0", + "version": "4.1.1", "license": "MIT", "dependencies": { "@electron/remote": "^2.0.8", diff --git a/package.json b/package.json index 54de979..953acde 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tidal-hifi", - "version": "4.1.0", + "version": "4.1.1", "description": "Tidal on Electron with widevine(hifi) support", "main": "src/main.js", "scripts": { diff --git a/src/main.js b/src/main.js index e53cdc4..2f8d228 100644 --- a/src/main.js +++ b/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(); diff --git a/src/preload.js b/src/preload.js index cc918e5..4cf3a65 100644 --- a/src/preload.js +++ b/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; } diff --git a/src/scripts/menu.js b/src/scripts/menu.js index 0850370..886684d 100644 --- a/src/scripts/menu.js +++ b/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;