webui: distinguish having live_update capability and having firmware checking enabled by the user, otherwise the enable/disable radio buttons would disappear once disabled

2 files changed, 3 insertions, 3 deletions

diff --git a/release/src/router/www/Advanced_FirmwareUpgrade_Content.asp b/release/src/router/www/Advanced_FirmwareUpgrade_Content.asp
index 5e540743f2..dcb2f1a301 100644
--- a/release/src/router/www/Advanced_FirmwareUpgrade_Content.asp
+++ b/release/src/router/www/Advanced_FirmwareUpgrade_Content.asp
@@ -115,7 +115,7 @@ function initial(){
 			document.getElementById("sig_ver_word").innerHTML = sig_ver;
 	}
 
-	if(!live_update_support || !HTTPS_support){
+	if(!live_update_support || !HTTPS_support || ("<% nvram_get("firmware_check_enable"); %>" != "1")){
 		document.getElementById("update").style.display = "none";
 		document.getElementById("linkpage_div").style.display = "";
 		document.getElementById("linkpage").style.display = "";
@@ -134,7 +134,7 @@ function initial(){
 	}
 
 	/* Viz remarked 2016.06.17		
-	if(!live_update_support || !HTTPS_support || exist_firmver[0] == 9){
+	if(!live_update_support || !HTTPS_support || ("<% nvram_get("firmware_check_enable"); %>" != "1") || exist_firmver[0] == 9){
 		document.getElementById('auto_upgrade_setting').style.display = "none";
 	}
 	else{
diff --git a/release/src/router/www/state.js b/release/src/router/www/state.js
index 8349e86803..355af4e882 100644
--- a/release/src/router/www/state.js
+++ b/release/src/router/www/state.js
@@ -294,7 +294,7 @@ var nfsd_support = isSupport("nfsd");
 var wifilogo_support = isSupport("WIFI_LOGO"); 
 var band2g_support = isSupport("2.4G"); 
 var band5g_support = isSupport("5G");
-var live_update_support = isSupport("update") && ("<% nvram_get("firmware_check_enable"); %>" == "1" ? true : false);
+var live_update_support = isSupport("update");
 var cooler_support = isSupport("fanctrl");
 var power_support = isSupport("pwrctrl");
 if(is_US_sku)