Merge remote-tracking branch 'origin/master'

7de51f99 · jiahua.liu · 05eb88e5 · b38f8252 · 7de51f99
Commit 7de51f99 authored Feb 02, 2020 by jiahua.liu
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt ...moe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt +5 -0

No files found.
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
@@ -280,6 +280,11 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
            while (rawInput.remaining >= length) {
                parsePacketAsync(rawInput.readPacket(length))

+                if (rawInput.remaining == 0L) {
+                    cachedPacket.value = null // 表示包长度正好
+                    cachedPacketTimeoutJob?.cancel()
+                    return
+                }
                length = rawInput.readInt() - 4
            }