From 58bd0d1f36c083802d0c59c2362fda81dfdb64eb Mon Sep 17 00:00:00 2001 From: Svallinn <41585298+Svallinn@users.noreply.github.com> Date: Sun, 6 Jun 2021 18:16:09 +0100 Subject: [PATCH] Store/Settings: Rename `webframe` -> `webFrame` and respective import This fixes an issue in which the user's preferred UI scaling was being ignored on startup. --- src/renderer/store/modules/settings.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js index 63908d6ca..49d43b005 100644 --- a/src/renderer/store/modules/settings.js +++ b/src/renderer/store/modules/settings.js @@ -1,7 +1,6 @@ import Datastore from 'nedb' let dbLocation -let webframe = null const usingElectron = window?.process?.type === 'renderer' @@ -14,11 +13,9 @@ if (usingElectron) { dbLocation = electron.remote.app.getPath('userData') } */ - const electron = require('electron') - const ipcRenderer = electron.ipcRenderer + const { ipcRenderer } = require('electron') dbLocation = ipcRenderer.sendSync('getUserDataPathSync') dbLocation = dbLocation + '/settings.db' - webframe = electron.webframe } else { dbLocation = 'settings.db' } @@ -225,8 +222,9 @@ Object.assign(actions, { commit('setBarColor', result.value) break case 'uiScale': - if (webframe) { - webframe.setZoomFactor(parseInt(result.value) / 100) + if (usingElectron) { + const { webFrame } = require('electron') + webFrame.setZoomFactor(parseInt(result.value) / 100) } commit('setUiScale', result.value) break