From 2d2b1027f8dfe4a5971b287fe5c48d964c6ca93b Mon Sep 17 00:00:00 2001 From: reito Date: Sun, 2 Jun 2024 15:45:58 +0800 Subject: [PATCH] fix heartbeat --- core/room_server.cpp | 3 --- proto/vts_server.proto | 1 + ui/windows/collabroom.cpp | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/room_server.cpp b/core/room_server.cpp index b27e991..8989535 100644 --- a/core/room_server.cpp +++ b/core/room_server.cpp @@ -123,8 +123,6 @@ void RoomServer::createRoom(const vts::server::ReqCreateRoom& req) { this->roomId = rsp.roomid(); emit room->onRoomInfoSucceed(rsp); - - startReceiveNotify(); }); CollabRoom::connect(worker, &QThread::finished, worker, &QThread::deleteLater); worker->setParent(room); @@ -153,7 +151,6 @@ void RoomServer::joinRoom(const std::string& peerId, const std::string& roomId, return; } - startReceiveNotify(); emit room->onRoomInfoSucceed(rsp); }); CollabRoom::connect(worker, &QThread::finished, worker, &QThread::deleteLater); diff --git a/proto/vts_server.proto b/proto/vts_server.proto index 633b185..1cc2657 100644 --- a/proto/vts_server.proto +++ b/proto/vts_server.proto @@ -31,6 +31,7 @@ message ReqCreateRoom { FrameFormatSetting format = 2; string nick = 4; string turn = 5; + optional string reclaimRoomId = 6; } message ReqJoinRoom { diff --git a/ui/windows/collabroom.cpp b/ui/windows/collabroom.cpp index e196e28..b462b2e 100644 --- a/ui/windows/collabroom.cpp +++ b/ui/windows/collabroom.cpp @@ -419,6 +419,7 @@ void CollabRoom::roomInfoSucceed(const vts::server::RspRoomInfo &info) { activateWindow(); isRoomInfoReady = true; + roomServer->startReceiveNotify(); } void CollabRoom::roomInfoFailed(const string &error) {