Merge pull request #143 from kenvix/master

Fixed a issue that cause bot initialization failed on headless platform

Merge pull request #143 from kenvix/master
Fixed a issue that cause bot initialization failed on headless platform
3a57d51b · Him188 · GitHub · b89c3f88 · 4eb5c861 · 3a57d51b
Commit 3a57d51b authored Mar 15, 2020 by Him188 Committed by GitHub Mar 15, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfigurationJvm.kt ...mMain/kotlin/net/mamoe/mirai/utils/BotConfigurationJvm.kt +9 -5

No files found.
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfigurationJvm.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfigurationJvm.kt
@@ -49,11 +49,15 @@ class DefaultLoginSolver(
            }
            tempFile.inputStream().use {
-                val img = ImageIO.read(it)
+                try {
-                if (img == null) {
+                    val img = ImageIO.read(it)
-                    logger.info("无法创建字符图片. 请查看文件")
+                    if (img == null) {
-                } else {
+                        logger.info("无法创建字符图片. 请查看文件")
-                    logger.info(img.createCharImg())
+                    } else {
+                        logger.info(img.createCharImg())
+                    }
+                } catch (throwable: Throwable) {
+                    logger.info("创建字符图片时出错(${throwable.toString()})。请查看文件")
                }
            }
        }