github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-02 04:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #296 from Karlatemp/patch-4

Browse Source 
Fix the error that directly closing the verification code window will block the coroutine.
This commit is contained in:
Him188 2020-05-05 12:20:11 +08:00 committed by GitHub
commit 45d96a8855
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/WindowHelperJvm.kt
View File

@ -22,6 +22,7 @@ import java.awt.event.WindowAdapter
import java.awt.event.WindowEvent import java.awt.event.WindowEvent
import javax.swing.JFrame import javax.swing.JFrame
import javax.swing.JTextField import javax.swing.JTextField
import javax.swing.SwingUtilities
// 隔离类代码 // 隔离类代码
internal object WindowHelperJvm { internal object WindowHelperJvm {
@ -88,7 +89,9 @@ internal suspend fun openWindow(title: String = "", initializer: WindowInitialzi
frame.title = title frame.title = title
frame.isVisible = true frame.isVisible = true
val result = def.await() val result = def.await().trim()
frame.dispose() SwingUtilities.invokeLater {
frame.dispose()
}
return result return result
} }