Merge pull request #672 from Ikaros-521/owner

main程序在聊天模式下主线程运行完没有等待子线程运行导致的edge-tts运行问题修复
Ikaros-521 · Feb 29, 2024 · 32f1390 · 32f1390
2 parents 2fc3b29 + 86c2a41
commit 32f1390
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Scripts/7.激活conda环境.bat b/Scripts/7.激活conda环境.bat
@@ -0,0 +1,8 @@
+@echo off
+
+SET CONDA_PATH=.\Miniconda3
+
+REM 激活base环境
+CALL %CONDA_PATH%\Scripts\activate.bat %CONDA_PATH%
+
+cmd /k
diff --git 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):