github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-17 09:12:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

[core] Ensure Bot's CoroutineScope is always cancelled on Bot.close if network.close threw an exception

Browse Source
This commit is contained in:
Him188 2022-12-27 17:28:52 +00:00
parent 38162db477
commit 2252683cee
No known key found for this signature in database
GPG Key ID: BA439CDDCF652375
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mirai-core/src/commonMain/kotlin/AbstractBot.kt
View File

@ -110,14 +110,16 @@ internal abstract class AbstractBot constructor(
override fun close(cause: Throwable?) { override fun close(cause: Throwable?) {
if (!this.isActive) return if (!this.isActive) return
if (networkInitialized) { try {
network.close(cause) if (networkInitialized) {
} network.close(cause)
}
if (cause == null) { } finally { // ensure CoroutineScope is always closed
supervisorJob.cancel() if (cause == null) {
} else { supervisorJob.cancel()
supervisorJob.cancel(CancellationException("Bot closed", cause)) } else {
supervisorJob.cancel(CancellationException("Bot closed", cause))
}
} }
} }