prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge new changes

Browse source
This commit is contained in:
varjolintu 2023-08-08 09:34:20 +03:00
parent 371514ac87
commit 1e5ec03d79
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keepassxc-browser/background/legacyProtocol.js
View file

@ -45,7 +45,7 @@ keepassProtocol.associate = async function(tab) {
keepass.associated.value = true;
keepass.associated.hash = response.hash || 0;
browserAction.show(tab);
browserAction.showDefault(tab);
return AssociatedAction.NEW_ASSOCIATION;
}

2
keepassxc-browser/background/legacyProtocolClient.js
View file

@ -37,7 +37,7 @@ keepassClient.sendNativeMessage = function(request, enableTimeout = false, timeo
const handler = (msg) => {
if (msg && msg?.action === action) {
// If the request has a separate requestID, check if it matches when there's no nonce (an error message)
const isNotificationOrError = !msg.nonce && request.requestID === msg.requestID;
const isNotificationOrError = !msg.nonce && (request.requestID === msg.requestID || (msg.error && msg.errorCode));
// Only resolve a matching response or a notification (without nonce)
if (isNotificationOrError || messageBuffer.matchAndRemove(msg)) {