From f20b7a758f7673ed3700c3963509d6822f378eb9 Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@163.com>
Date: Sun, 19 May 2024 15:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=B6=E8=97=8F=E5=A4=B9?=
 =?UTF-8?q?=E7=9A=84=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pywxdump/wx_info/merge_db.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pywxdump/wx_info/merge_db.py b/pywxdump/wx_info/merge_db.py
index 9c45b41..6ebefcd 100644
--- a/pywxdump/wx_info/merge_db.py
+++ b/pywxdump/wx_info/merge_db.py
@@ -321,7 +321,8 @@ def decrypt_merge(wx_path, key, outpath="", CreateTime: int = 0, endCreateTime:
 
     # 解密
     code, wxdbpaths = get_core_db(wx_path, ["MSG", "MediaMSG", "MicroMsg", "OpenIMContact", "OpenIMMedia", "OpenIMMsg", "Favorite"])
-
+    if not code:
+        return False, wxdbpaths
     # 判断out_path是否为空目录
     if os.path.exists(decrypted_path) and os.listdir(decrypted_path):
         for root, dirs, files in os.walk(decrypted_path, topdown=False):