diff --git a/package.json b/package.json index c9a43169..3af2e105 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "frankerfacez", "author": "Dan Salvato LLC", - "version": "4.20.73", + "version": "4.20.74", "description": "FrankerFaceZ is a Twitch enhancement suite.", "license": "Apache-2.0", "scripts": { diff --git a/src/modules/main_menu/components/backup-restore.vue b/src/modules/main_menu/components/backup-restore.vue index fc52c023..88e78ca0 100644 --- a/src/modules/main_menu/components/backup-restore.vue +++ b/src/modules/main_menu/components/backup-restore.vue @@ -91,6 +91,9 @@ export default { let file; try { file = await openFile('application/json,application/zip'); + if ( ! file ) + return; + } catch(err) { this.error_desc = this.t('setting.backup-restore.read-error', 'Unable to read file.'); this.error = true; diff --git a/src/settings/index.js b/src/settings/index.js index 579ebe4e..ba09a2c0 100644 --- a/src/settings/index.js +++ b/src/settings/index.js @@ -522,7 +522,7 @@ export default class SettingsManager extends Module { } // Change over. - localStorage.ffzProvider = key; + localStorage.ffzProviderv2 = key; location.reload(); } diff --git a/src/utilities/dom.js b/src/utilities/dom.js index e718c20f..718610fd 100644 --- a/src/utilities/dom.js +++ b/src/utilities/dom.js @@ -205,20 +205,22 @@ export function openFile(contentType, multiple) { let resolved = false; - const focuser = () => { + // TODO: Investigate this causing issues + // for some users. + /*const focuser = () => { off(window, 'focus', focuser); setTimeout(() => { if ( ! resolved ) { resolved = true; resolve(multiple ? [] : null); } - }, 500); + }, 5000); }; - on(window, 'focus', focuser); + on(window, 'focus', focuser);*/ input.onchange = () => { - off(window, 'focus', focuser); + //off(window, 'focus', focuser); if ( ! resolved ) { resolved = true; const files = Array.from(input.files);