From d2b7421df7adf0f59448347e15b09a3a0e570689 Mon Sep 17 00:00:00 2001 From: Him188 Date: Sun, 23 Aug 2020 19:52:24 +0800 Subject: [PATCH] Stop input on CancellationException --- .../main/kotlin/net/mamoe/mirai/console/pure/ConsoleThread.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/ConsoleThread.kt b/frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/ConsoleThread.kt index 934608621..9a8fda417 100644 --- a/frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/ConsoleThread.kt +++ b/frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/ConsoleThread.kt @@ -47,7 +47,7 @@ internal fun startupConsoleThread() { } } - CoroutineScope(dispatch + SupervisorJob()).launch { + MiraiConsole.launch(dispatch) { val consoleLogger = DefaultLogger("console") while (isActive) { try { @@ -78,6 +78,8 @@ internal fun startupConsoleThread() { } } catch (e: InterruptedException) { return@launch + } catch (e: CancellationException) { + return@launch } catch (e: Throwable) { consoleLogger.error("Unhandled exception", e) }