From f394cbf57f7c8216b18a41da97a1742340cec95f Mon Sep 17 00:00:00 2001
From: Daniel James Smith <djsmith@web.de>
Date: Fri, 22 Oct 2021 10:01:18 +0200
Subject: [PATCH] Revert "Remove check for isVivaldi"

This reverts commit c318b58185e97e613d921fe15fdf5cf9c5e6e430.
---
 src/background/commands.background.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/background/commands.background.ts b/src/background/commands.background.ts
index 51d3f47aace..2e78cdd3308 100644
--- a/src/background/commands.background.ts
+++ b/src/background/commands.background.ts
@@ -9,10 +9,12 @@ import LockedVaultPendingNotificationsItem from './models/lockedVaultPendingNoti
 
 export default class CommandsBackground {
     private isSafari: boolean;
+    private isVivaldi: boolean;
 
     constructor(private main: MainBackground, private passwordGenerationService: PasswordGenerationService,
         private platformUtilsService: PlatformUtilsService, private vaultTimeoutService: VaultTimeoutService) {
         this.isSafari = this.platformUtilsService.isSafari();
+        this.isVivaldi = this.platformUtilsService.isVivaldi();
     }
 
     async init() {
@@ -21,12 +23,12 @@ export default class CommandsBackground {
                 await this.processCommand(msg.data.commandToRetry.msg.command, msg.data.commandToRetry.sender);
             }
 
-            if (msg.command === 'keyboardShortcutTriggered' && msg.shortcut) {
+            if (this.isVivaldi && msg.command === 'keyboardShortcutTriggered' && msg.shortcut) {
                 await this.processCommand(msg.shortcut, sender);
             }
         });
 
-        if (chrome && chrome.commands) {
+        if (!this.isVivaldi && chrome && chrome.commands) {
             chrome.commands.onCommand.addListener(async (command: string) => {
                 await this.processCommand(command);
             });