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

Log exception when failed to initialize java.desktop for better user debugging; Use CLI if in headless mode

Browse Source
This commit is contained in:
Karlatemp 2022-04-30 12:49:28 +08:00
parent 4993e59fd0
commit c37576fda7
No known key found for this signature in database
GPG Key ID: C6B606FF23D8FED7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mirai-core-api/src/jvmMain/kotlin/utils/SwingSolver.kt
View File

@ -141,6 +141,9 @@ internal object WindowHelperJvm {
}
if (System.getProperty("mirai.no-desktop") != null) return@run PlatformKind.CLI
kotlin.runCatching {
Class.forName("java.awt.GraphicsEnvironment")
if (GraphicsEnvironment.isHeadless()) return@run PlatformKind.CLI
Class.forName("java.awt.Desktop")
Class.forName("java.awt.Toolkit")
Toolkit.getDefaultToolkit()
@ -160,6 +163,9 @@ internal object WindowHelperJvm {
} else {
return@run PlatformKind.CLI
}
}.onFailure { error ->
if (error.javaClass == ClassNotFoundException::class.java && error.cause == null) return@onFailure
logger.warning("Failed to initialize module `java.desktop`", error)
}.getOrElse {
return@run PlatformKind.CLI
}