Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Mar 1, 2023
Merged

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

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4905eec
修复在Android系统运行时，被杀后台时抛出的 InterruptedException 导致崩溃
zhaodice Feb 5, 2023
071665e
Merge branch 'dev' into patch-1
zhaodice Feb 6, 2023
d7e5eb8
Update mirai-console/backend/mirai-console/src/MiraiConsoleImplementa…
zhaodice Feb 20, 2023
6e1863d
Merge branch 'dev' into patch-1
zhaodice Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

}
}
})
Expand Down Expand Up @@ -509,4 +513,4 @@ public interface MiraiConsoleImplementation : CoroutineScope {
}
}
}
}
}