From 774bc1d41f6bea48d814dea565464947e909b8d7 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Mon, 28 Oct 2019 10:22:28 +0200
Subject: [PATCH] Ignore update icon if update check is set to never

---
 keepassxc-browser/background/keepass.js | 4 +++-
 keepassxc-browser/options/options.js    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js
index 6af1ae2..2d63558 100755
--- a/keepassxc-browser/background/keepass.js
+++ b/keepassxc-browser/background/keepass.js
@@ -881,9 +881,11 @@ keepass.keePassXCUpdateAvailable = function() {
         if (daysSinceLastCheck >= page.settings.checkUpdateKeePassXC) {
             keepass.checkForNewKeePassXCVersion();
         }
+
+        return keepass.compareVersion(keepass.currentKeePassXC, keepass.latestKeePassXC.version, false);
     }
 
-    return keepass.compareVersion(keepass.currentKeePassXC, keepass.latestKeePassXC.version, false);
+    return false;
 };
 
 keepass.checkForNewKeePassXCVersion = function() {
diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js
index cd7f9f0..20aaf59 100644
--- a/keepassxc-browser/options/options.js
+++ b/keepassxc-browser/options/options.js
@@ -111,7 +111,7 @@ options.initGeneralSettings = function() {
     $('#tab-general-settings input#defaultGroup').val(options.settings['defaultGroup']);
 
     $('#tab-general-settings input[type=radio]').each(function() {
-        if ($(this).val() === options.settings[$(this).attr('name')]) {
+        if ($(this).val() === String(options.settings[$(this).attr('name')])) {
             $(this).attr('checked', options.settings[$(this).attr('name')]);
         }
     });