diff --git a/server/2015Remote/McpChat.cpp b/server/2015Remote/McpChat.cpp index bc0107c..57e5324 100644 --- a/server/2015Remote/McpChat.cpp +++ b/server/2015Remote/McpChat.cpp @@ -938,13 +938,16 @@ CMcpServer::ChatWaitResult CMcpServer::WaitChatMessages( m_ChatCv.wait_until(lk, until); } + // 进 drain 前先记住「等待结束时是否已有消息」:drain 会把 inbox 清空, + // 之后再用 inbox.empty() 判断超时会把「收到消息」也标成 timed_out=true。 + const bool arrived = !s->inbox.empty(); while (!s->inbox.empty() && out.size() < maxMessages) { out.push_back(s->inbox.front()); s->inboxBytes -= s->inbox.front().text.size(); s->inbox.pop_front(); } - timedOut = s->inbox.empty() && !s->closed; + timedOut = !arrived && !s->closed; closed = s->closed; dropped = s->dropped; s->dropped = 0;