From 753342d99e4e4d204e44698933eec1b779a4b0a2 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sat, 21 May 2022 15:21:01 +0100
Subject: [PATCH] Add timeout for logout on close
---
mirai-core/src/commonMain/kotlin/QQAndroidBot.kt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt b/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
index 7e0be7c95..d194fd89a 100644
--- a/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
+++ b/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
@@ -52,6 +52,7 @@ import net.mamoe.mirai.utils.BotConfiguration
import net.mamoe.mirai.utils.MiraiLogger
import net.mamoe.mirai.utils.lateinitMutableProperty
import kotlin.contracts.contract
+import kotlin.time.Duration.Companion.seconds
internal fun Bot.asQQAndroidBot(): QQAndroidBot {
contract {
@@ -73,7 +74,9 @@ internal open class QQAndroidBot constructor(
if (!this.isActive) return
runBlocking {
try { // this may not be very good but
- components[SsoProcessor].logout(network)
+ withTimeoutOrNull(5.seconds) {
+ components[SsoProcessor].logout(network)
+ }
} catch (ignored: Exception) {
}
}