From cb78ed34a5719c209e136747a6323d8c424e7e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=80=A1=E7=84=B6?=
 <63996691+zhaodice@users.noreply.github.com>
Date: Thu, 2 Mar 2023 01:57:57 +0800
Subject: [PATCH] =?UTF-8?q?[console]=20=E4=BF=AE=E5=A4=8D=E5=9C=A8Android?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=BF=90=E8=A1=8C=E6=97=B6=EF=BC=8C=E8=A2=AB?=
 =?UTF-8?q?=E6=9D=80=E5=90=8E=E5=8F=B0=E6=97=B6=E6=8A=9B=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=20InterruptedException=20=E5=AF=BC=E8=87=B4=E5=B4=A9=E6=BA=83?=
 =?UTF-8?q?=20(#2474)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复在Android系统运行时，被杀后台时抛出的 InterruptedException 导致崩溃

* Update mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt

Co-authored-by: Him188 <Him188@mamoe.net>

---------

Co-authored-by: Him188 <Him188@mamoe.net>
---
 .../mirai-console/src/MiraiConsoleImplementation.kt    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt b/mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt
index 1832159bf..40c59c7e7 100644
--- a/mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt
+++ b/mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt
@@ -449,8 +449,12 @@ public interface MiraiConsoleImplementation : CoroutineScope {
         init {
             Runtime.getRuntime().addShutdownHook(thread(false, name = "Mirai Console Shutdown Hook") {
                 if (instanceInitialized) {
-                    runBlocking {
-                        shutdown()
+                    try {
+                        runBlocking {
+                            shutdown()
+                        }
+                    } catch (_ : InterruptedException) {
+
                     }
                 }
             })
@@ -509,4 +513,4 @@ public interface MiraiConsoleImplementation : CoroutineScope {
             }
         }
     }
-}
\ No newline at end of file
+}