~bug fix

scripts/lang/chs/dns.lang

@@ -51,17 +51,6 @@ DNS_IPV6_NOT_SUPPORT="该选项暂不支持IPv6加密DNS！"
 DNS_ENCRYPT_OK="已设置加密DNS，如遇DNS解析问题，请重置DNS配置！"
 DNS_CORE_REQUIRE="请使用Mihomo或SingBox内核"
 DNS_SET_TO="设为"
-DNS_PROTECT_NOW="当前"
-DNS_HOSTS_NOW="当前"
-DNS_ENABLED="已启用"
-DNS_DISABLED="已禁用"
-DNS_PROTECT_DISABLE_Q="DNS防泄漏，是否确认禁用？"
-DNS_PROTECT_ENABLE_Q="DNS防泄漏，是否确认启用？"
-DNS_HOSTS_DISABLE_Q="Hosts优化，是否确认禁用？"
-DNS_HOSTS_ENABLE_Q="Hosts优化，是否确认启用？"
-DNS_YES="是"
-DNS_RESET_DEFAULT="重置为默认值"
-DNS_NO_BACK="否，返回上级菜单"
 DNS_REMOVE_OK="移除成功"
 DNS_REMOVE_FAIL="移除失败"
 DNS_INPUT_REDIR_PORT="请直接输入旁路由IPV4地址"

scripts/lang/en/dns.lang

@@ -53,17 +53,6 @@ DNS_IPV6_NOT_SUPPORT="This option does not support IPv6 encrypted DNS!"
 DNS_ENCRYPT_OK="Encrypted DNS has been configured. If DNS issues occur, please reset DNS settings."
 DNS_CORE_REQUIRE="Please use the Mihomo or SingBox core"
 DNS_SET_TO="Set to"
-DNS_PROTECT_NOW="Current status: "
-DNS_HOSTS_NOW="Current status: "
-DNS_ENABLED="enabled"
-DNS_DISABLED="disabled"
-DNS_PROTECT_DISABLE_Q=" DNS leak protection. Disable now?"
-DNS_PROTECT_ENABLE_Q=" DNS leak protection. Enable now?"
-DNS_HOSTS_DISABLE_Q=" Hosts optimization. Disable now?"
-DNS_HOSTS_ENABLE_Q=" Hosts optimization. Enable now?"
-DNS_YES="Yes"
-DNS_RESET_DEFAULT="Reset to defaults"
-DNS_NO_BACK="No, back"
 DNS_REMOVE_OK="Removed successfully"
 DNS_REMOVE_FAIL="Remove failed"
 DNS_INPUT_REDIR_PORT="Please input bypass-router IPv4 address"

scripts/menu.sh

@@ -153,7 +153,7 @@ ckstatus() {
 			zip_type=$(echo "$file" | grep -oE 'tar.gz$|upx$|gz$')
 			. "$CRASHDIR"/menus/9_upgrade.sh && setcoretype
 			. "$CRASHDIR"/libs/core_tools.sh && core_check "/tmp/$file"
-			if [ "$?" = 0 ]; then
+			if [ "$?" = 0 ] && [ -n "$crashcore" ]; then
 				msg_alert "\033[32m$MENU_CORE_LOADED_OK\033[0m"
 				switch_core
 			else

scripts/menus/dns.sh

@@ -48,116 +48,31 @@ set_dns_mod() {
             msg_alert "\033[36m$DNS_SET_OK：$dns_mod\033[0m"
             ;;
         4)
-            while true; do
+			if [ "$dns_protect" = ON ]; then
-                line_break
+				dns_protect=OFF
-                separator_line "="
+			else
-                if [ "$dns_protect" = ON ]; then
+				dns_protect=ON
-                    content_line "$DNS_PROTECT_NOW\033[33m$DNS_ENABLED\033[0m$DNS_PROTECT_DISABLE_Q"
+			fi
-                else
+			setconfig dns_protect "$dns_protect"
-                    content_line "$DNS_PROTECT_NOW\033[33m$DNS_DISABLED\033[0m$DNS_PROTECT_ENABLE_Q"
+			common_success
-                fi
-                separator_line "="
-                btm_box "1) $DNS_YES" \
-                    "2) $DNS_RESET_DEFAULT" \
-                    "0) $DNS_NO_BACK"
-                read -r -p "$COMMON_INPUT> " num
-                case "$num" in
-                0)
-                    break
-                    ;;
-                1)
-                    if [ "$dns_protect" = ON ]; then
-                        dns_protect=OFF
-                    else
-                        dns_protect=ON
-                    fi
-                    ;;
-                2)
-                    dns_protect=ON
-                    ;;
-                *)
-                    errornum
-                    continue
-                    ;;
-                esac
-                setconfig dns_protect "$dns_protect"
-                common_success
-            done
             ;;
         5)
-            while true; do
+			if [ "$hosts_opt" = ON ]; then
-                line_break
+				hosts_opt=OFF
-                separator_line "="
+			else
-                if [ "$hosts_opt" = ON ]; then
+				hosts_opt=ON
-                    content_line "$DNS_HOSTS_NOW\033[33m$DNS_ENABLED\033[0m$DNS_HOSTS_DISABLE_Q"
+			fi
-                else
+			setconfig hosts_opt "$hosts_opt"
-                    content_line "$DNS_HOSTS_NOW\033[33m$DNS_DISABLED\033[0m$DNS_HOSTS_ENABLE_Q"
+			common_success
-                fi
-                separator_line "="
-                btm_box "1) $DNS_YES" \
-                    "2) $DNS_RESET_DEFAULT" \
-                    "0) $DNS_NO_BACK"
-                read -r -p "$COMMON_INPUT> " num
-                case "$num" in
-                0)
-                    break
-                    ;;
-                1)
-                    if [ "$hosts_opt" = ON ]; then
-                        hosts_opt=OFF
-                    else
-                        hosts_opt=ON
-                    fi
-                    ;;
-                2)
-                    hosts_opt=ON
-                    ;;
-                *)
-                    errornum
-                    continue
-                    ;;
-                esac
-                setconfig dns_protect "$hosts_opt"
-                common_success
-            done
             ;;
         6)
-
+			if [ "$ecs_subnet" = ON ]; then
-            while true; do
+				ecs_subnet=OFF
-                line_break
+			else
-                separator_line "="
+				ecs_subnet=ON
-                if [ "$ecs_subnet" = ON ]; then
+			fi
-                    content_line "$DNS_HOSTS_NOW\033[33m$DNS_ENABLED\033[0m$DNS_HOSTS_DISABLE_Q"
+			setconfig ecs_subnet "$ecs_subnet"
-                else
+			common_success
-                    content_line "$DNS_HOSTS_NOW\033[33m$DNS_DISABLED\033[0m$DNS_HOSTS_ENABLE_Q"
-                fi
-                separator_line "="
-                btm_box "1) $DNS_YES" \
-                    "2) $DNS_RESET_DEFAULT" \
-                    "0) $DNS_NO_BACK"
-                read -r -p "$COMMON_INPUT> " num
-                case "$num" in
-                0)
-                    break
-                    ;;
-                1)
-                    if [ "$ecs_subnet" = ON ]; then
-                        ecs_subnet=OFF
-                    else
-                        ecs_subnet=ON
-                    fi
-                    ;;
-                2)
-                    ecs_subnet=OFF
-                    ;;
-                *)
-                    errornum
-                    continue
-                    ;;
-                esac
-                setconfig dns_protect "$ecs_subnet"
-                common_success
-            done
             ;;
         7)
             while true; do