From e5136dd2e545eb9f8a500a2d467589e1d58a7058 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Fri, 5 Mar 2021 00:30:17 +0800
Subject: [PATCH] =?UTF-8?q?json=E5=BA=93=E4=BC=9A=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E6=9C=89LOG=E6=A8=A1=E5=9D=97=E5=86=8DLOG.print?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/json.lua | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Zframework/json.lua b/Zframework/json.lua
index fa725027..c66d5013 100644
--- a/Zframework/json.lua
+++ b/Zframework/json.lua
@@ -117,9 +117,8 @@ function json.encode(val)
 	local a,b=pcall(encode,val)
 	if a then
 		return b
-	else
+	elseif LOG then
 		LOG.print(text.jsonError..": "..(b or"uknErr"),"warn")
-		return
 	end
 end
 
@@ -348,8 +347,7 @@ function json.decode(str)
 	local a,b=pcall(decode,str)
 	if a then
 		return b
-	else
+	elseif LOG then
 		LOG.print(text.jsonError..": "..(b or"uknErr"),"warn")
-		return
 	end
 end
\ No newline at end of file