From ea5f3c222f8556c6d0ded720c7be405737c781c5 Mon Sep 17 00:00:00 2001
From: Rock Chin <1010553892@qq.com>
Date: Mon, 6 Mar 2023 20:53:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=BB=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8Bmain=E6=B5=81=E7=A8=8B=E4=BB=A5=E5=88=9D=E6=AD=A5?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/main.py b/main.py
index 8fcbcf19..7f25531f 100644
--- a/main.py
+++ b/main.py
@@ -107,6 +107,8 @@ def reset_logging():
 
 
 def main(first_time_init=False):
+    """启动流程，reload之后会被执行"""
+
     global known_exception_caught
 
     import config
@@ -203,7 +205,7 @@ def main(first_time_init=False):
 
         pkg.plugin.host.initialize_plugins()
 
-        if first_time_init:  # 不是热重载之后的启动,则不启动新的bot线程
+        if first_time_init:  # 是热重载之后的启动,则不启动新的bot线程
 
             import mirai.exceptions
 
@@ -292,17 +294,7 @@ def main(first_time_init=False):
     except Exception as e:
         logging.warning("检查更新失败:{}".format(e))
 
-    while True:
-        try:
-            time.sleep(10)
-            if qqbot != pkg.utils.context.get_qqbot_manager():  # 已经reload了
-                logging.info("以前的main流程由于reload退出")
-                break
-        except KeyboardInterrupt:
-            stop()
-
-            print("程序退出")
-            sys.exit(0)
+    return qqbot
 
 
 def stop():
@@ -365,4 +357,14 @@ if __name__ == '__main__':
     # pkg.utils.configmgr.set_config_and_reload("quote_origin", False)
     requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 
-    main(True)
+    qqbot = main(True)
+
+    import pkg.utils.context
+    while True:
+        try:
+            time.sleep(10)
+        except KeyboardInterrupt:
+            stop()
+
+            print("程序退出")
+            sys.exit(0)