From 68f5f123cae65e74527606da727e456bd07e07e6 Mon Sep 17 00:00:00 2001
From: itdoginfo <koalav42@gmail.com>
Date: Sat, 10 May 2025 12:50:01 +0300
Subject: [PATCH] v0.3.47 Fix noresolv 1

---
 luci-app-podkop/Makefile    |  2 +-
 podkop/Makefile             |  2 +-
 podkop/files/usr/bin/podkop | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/luci-app-podkop/Makefile b/luci-app-podkop/Makefile
index 2d6ba9d..f0289bb 100644
--- a/luci-app-podkop/Makefile
+++ b/luci-app-podkop/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-podkop
-PKG_VERSION:=0.3.46
+PKG_VERSION:=0.3.47
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI podkop app
diff --git a/podkop/Makefile b/podkop/Makefile
index eba6b69..aaec871 100644
--- a/podkop/Makefile
+++ b/podkop/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=podkop
-PKG_VERSION:=0.3.46
+PKG_VERSION:=0.3.47
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=ITDog <podkop@itdog.info>
diff --git a/podkop/files/usr/bin/podkop b/podkop/files/usr/bin/podkop
index 6e4ac33..6d5f451 100755
--- a/podkop/files/usr/bin/podkop
+++ b/podkop/files/usr/bin/podkop
@@ -163,7 +163,7 @@ stop_main() {
 
     if [ -f /var/run/podkop_list_update.pid ]; then
         pid=$(cat /var/run/podkop_list_update.pid)
-        if kill -0 "$pid"; then
+        if kill -0 "$pid" 2>/dev/null; then
             kill "$pid" 2>/dev/null
             log "Stopped list_update"
         fi
@@ -378,8 +378,6 @@ save_dnsmasq_config() {
 
 dnsmasq_add_resolver() {
     log "Save dnsmasq config"
-    save_dnsmasq_config "dhcp.@dnsmasq[0].noresolv" "dhcp.@dnsmasq[0].podkop_noresolv"
-    save_dnsmasq_config "dhcp.@dnsmasq[0].cachesize" "dhcp.@dnsmasq[0].podkop_cachesize"
 
     uci -q delete dhcp.@dnsmasq[0].podkop_server
     for server in $(uci get dhcp.@dnsmasq[0].server 2>/dev/null); do
@@ -391,6 +389,9 @@ dnsmasq_add_resolver() {
         fi
     done
 
+    save_dnsmasq_config "dhcp.@dnsmasq[0].noresolv" "dhcp.@dnsmasq[0].podkop_noresolv"
+    save_dnsmasq_config "dhcp.@dnsmasq[0].cachesize" "dhcp.@dnsmasq[0].podkop_cachesize"
+
     log "Configure dnsmasq for sing-box"
     uci set dhcp.@dnsmasq[0].noresolv="1"
     uci set dhcp.@dnsmasq[0].cachesize="0"
@@ -1225,8 +1226,8 @@ sing_box_config_vless() {
     if [ $? -eq 0 ]; then
         log "Config VLESS created successfully"
     else
-        log "Error: VLESS invalid JSON config generated"
-        return 1
+        log "[critical] Error: VLESS invalid JSON config generated"
+        exit 1
     fi
 }