|
|
@ -346,6 +346,10 @@ async function createWindow() {
|
|
|
|
|
|
|
|
|
|
|
|
mainWindow.on('focus', () => {
|
|
|
|
mainWindow.on('focus', () => {
|
|
|
|
mainWindow.flashFrame(false);
|
|
|
|
mainWindow.flashFrame(false);
|
|
|
|
|
|
|
|
if (passwordWindow) {
|
|
|
|
|
|
|
|
passwordWindow.close();
|
|
|
|
|
|
|
|
passwordWindow = null;
|
|
|
|
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
if (config.environment === 'test') {
|
|
|
|
if (config.environment === 'test') {
|
|
|
@ -1018,11 +1022,6 @@ ipc.on('password-window-login', async (event, passPhrase) => {
|
|
|
|
const passwordAttempt = true;
|
|
|
|
const passwordAttempt = true;
|
|
|
|
await showMainWindow(passPhrase, passwordAttempt);
|
|
|
|
await showMainWindow(passPhrase, passwordAttempt);
|
|
|
|
sendResponse();
|
|
|
|
sendResponse();
|
|
|
|
|
|
|
|
|
|
|
|
if (passwordWindow) {
|
|
|
|
|
|
|
|
passwordWindow.close();
|
|
|
|
|
|
|
|
passwordWindow = null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} catch (e) {
|
|
|
|
} catch (e) {
|
|
|
|
const localisedError = locale.messages.invalidPassword.message;
|
|
|
|
const localisedError = locale.messages.invalidPassword.message;
|
|
|
|
sendResponse(localisedError || 'Invalid password');
|
|
|
|
sendResponse(localisedError || 'Invalid password');
|
|
|
|