From 8a591ed23f2df5f985b265f2e5e559919e600d3c Mon Sep 17 00:00:00 2001 From: GeekCorner <45696571+GeekCornerGH@users.noreply.github.com> Date: Mon, 23 May 2022 13:11:04 +0200 Subject: [PATCH] fix: Launcher freeze If you were opening the MS Login while in settings and close the window before finishing auth, the launcher throws an error. This patch fixes the issue --- app/assets/js/scripts/settings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/js/scripts/settings.js b/app/assets/js/scripts/settings.js index e86de97..8750811 100644 --- a/app/assets/js/scripts/settings.js +++ b/app/assets/js/scripts/settings.js @@ -368,13 +368,13 @@ ipcRenderer.on(MSFT_OPCODE.REPLY_LOGIN, (_, ...arguments_) => { const viewOnClose = arguments_[2] // Error from request to Microsoft. - if (Object.prototype.hasOwnProperty.call(queryMap, 'error')) { + if (Object.prototype.hasOwnProperty.call(queryMap, error)) { switchView(getCurrentView(), viewOnClose, 500, 500, () => { // TODO Dont know what these errors are. Just show them I guess. // This is probably if you messed up the app registration with Azure. console.log('Error getting authCode, is Azure application registered correctly?') console.log(error) - console.log(error_description) + console.log(queryMap.error_description) console.log('Full query map', queryMap) let error = queryMap.error // Error might be 'access_denied' ? let errorDesc = queryMap.error_description @@ -1534,4 +1534,4 @@ function prepareSettings(first = false) { } // Prepare the settings UI on startup. -//prepareSettings(true) \ No newline at end of file +//prepareSettings(true)