From 86c2a41c4a8bbee2db953d3c0c12da4a9879a9eb Mon Sep 17 00:00:00 2001
From: ikaros <327209194@qq.com>
Date: Thu, 29 Feb 2024 23:52:56 +0800
Subject: [PATCH] =?UTF-8?q?main=E7=A8=8B=E5=BA=8F=E5=9C=A8=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E6=A8=A1=E5=BC=8F=E4=B8=8B=20=E4=B8=BB=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=E8=BF=90=E8=A1=8C=E5=AE=8C=E6=B2=A1=E6=9C=89=E7=AD=89?=
 =?UTF-8?q?=E5=BE=85=E5=AD=90=E7=BA=BF=E7=A8=8B=E8=BF=90=E8=A1=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84edge-tts=E8=BF=90=E8=A1=8C=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...\277\200\346\264\273conda\347\216\257\345\242\203.bat" | 8 ++++++++
 main.py                                                   | 3 +++
 2 files changed, 11 insertions(+)
 create mode 100644 "Scripts/7.\346\277\200\346\264\273conda\347\216\257\345\242\203.bat"

diff --git "a/Scripts/7.\346\277\200\346\264\273conda\347\216\257\345\242\203.bat" "b/Scripts/7.\346\277\200\346\264\273conda\347\216\257\345\242\203.bat"
new file mode 100644
index 00000000..e59c0fbd
--- /dev/null
+++ "b/Scripts/7.\346\277\200\346\264\273conda\347\216\257\345\242\203.bat"
@@ -0,0 +1,8 @@
+@echo off
+
+SET CONDA_PATH=.\Miniconda3
+
+REM 激活base环境
+CALL %CONDA_PATH%\Scripts\activate.bat %CONDA_PATH%
+
+cmd /k
\ No newline at end of file
diff --git a/main.py b/main.py
index f76dc653..0a20611b 100644
--- a/main.py
+++ b/main.py
@@ -2184,6 +2184,9 @@ def send():
         finally:
             logging.warning('关闭连接...')
             os._exit(0)
+    elif platform == "talk":
+        thread.join()
+
 
 # 退出程序
 def exit_handler(signum, frame):