diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index f7e56811..195647a8 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -616,10 +616,6 @@ export class BrowserWindow { event.returnValue = wpData; }) - ipcMain.on("cider-platform", (event) => { - event.returnValue = process.platform; - }); - ipcMain.handle("reinstall-widevine-cdm", () => { // remove WidevineCDM from appdata folder const widevineCdmPath = join(app.getPath("userData"), "./WidevineCdm"); diff --git a/src/main/base/store.ts b/src/main/base/store.ts index bd18980d..5cc8c653 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -1,10 +1,16 @@ import * as ElectronStore from 'electron-store'; import * as electron from "electron"; +import {app} from "electron"; export class Store { static cfg: ElectronStore; private defaults: any = { + "main": { + "PLATFORM": process.platform, + "ENV": process.env, + "UPDATABLE": app.isPackaged && (!process.mas || !process.windowsStore || !process.env.FLATPAK_ID) + }, "general": { "close_button_hide": false, "discord_rpc": 1, // 0 = disabled, 1 = enabled as Cider, 2 = enabled as Apple Music diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 706ed2ad..21cd703d 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -604,7 +604,7 @@ const app = new Vue({ document.body.classList.add("no-gpu") } this.mk._services.timing.mode = 0 - this.platform = ipcRenderer.sendSync('cider-platform'); + this.platform = this.cfg.main.PLATFORM this.mklang = await this.MKJSLang() diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 4f56429d..6318dade 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -925,7 +925,7 @@ CiderAudio.spatialOn() CiderAudio.hierarchical_loading(); } - } + } } else { CiderAudio.off(); } @@ -950,20 +950,21 @@ ipcRenderer.invoke('update-store-mtt', app.cfg.general.close_behavior); }, checkIfUpdateDisabled() { - if (ipcRenderer.sendSync('disable-update')) { - let updateFields = document.getElementsByClassName('update-check'); - for (var i=0; i < updateFields.length; i++) { - updateFields[i].style = "opacity: 0.5; pointer-events: none;"; - updateFields[i].title = "Not available on this type of build"; - } + if (app.cfg.main.UPDATABLE) return; + + let updateFields = document.getElementsByClassName('update-check'); + for (let i=0; i < updateFields.length; i++) { + updateFields[i].style = "opacity: 0.5; pointer-events: none;"; + updateFields[i].title = "Not available on this type of build"; } + }, promptForRelaunch(){ bootbox.confirm(app.getLz('action.relaunch.confirm'), function (result) { if (result) { ipcRenderer.send('relaunchApp',''); } - }); + }); } } })