fix heartbeat

reitovo · Jun 2, 2024 · 951f904 · 951f904
1 parent 365f72f
commit 951f904
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/core/room_server.cpp b/core/room_server.cpp
@@ -75,6 +75,7 @@ void RoomServer::startReceiveNotify() {
         qDebug() << "notify thread exited";
     }));
     notifyThread->start();
+    startNatTypeDetect();
 }
 
 void RoomServer::startNatTypeDetect() {
@@ -121,9 +122,9 @@ void RoomServer::createRoom(const vts::server::ReqCreateRoom& req) {
         }
 
         this->roomId = rsp.roomid();
-        startReceiveNotify();
-        startNatTypeDetect();
         emit room->onRoomInfoSucceed(rsp);
+
+        startReceiveNotify();
     });
     CollabRoom::connect(worker, &QThread::finished, worker, &QThread::deleteLater);
     worker->setParent(room);
@@ -153,7 +154,6 @@ void RoomServer::joinRoom(const std::string& peerId, const std::string& roomId,
         }
 
         startReceiveNotify();
-        startNatTypeDetect();
         emit room->onRoomInfoSucceed(rsp);
     });
     CollabRoom::connect(worker, &QThread::finished, worker, &QThread::deleteLater);

diff --git a/ui/windows/collabroom.cpp b/ui/windows/collabroom.cpp
@@ -107,7 +107,14 @@ CollabRoom::CollabRoom(bool isServer, QString roomId, QWidget *parent) :
     qDebug() << "Using Room Endpoint" << roomEndpoint;
 
     this->roomId = roomId;
-    localPeerId = QUuid::createUuid().toString(QUuid::WithoutBraces);
+
+    localPeerId =  QSysInfo::machineUniqueId();
+    if (localPeerId.isEmpty()) {
+        localPeerId = QSysInfo::bootUniqueId();
+    }
+    if (localPeerId.isEmpty()) {
+        localPeerId = QUuid::createUuid().toString(QUuid::WithoutBraces);
+    }
 
     useDxCapture = settings.value("useDxCapture", false).toBool();
     qDebug() << "sender is" << (useDxCapture ? "dx" : "spout");
@@ -410,6 +417,8 @@ void CollabRoom::roomInfoSucceed(const vts::server::RspRoomInfo &info) {
 
     show();
     activateWindow();
+
+    isRoomInfoReady = true;
 }
 
 void CollabRoom::roomInfoFailed(const string &error) {

diff --git a/ui/windows/collabroom.h b/ui/windows/collabroom.h
@@ -138,6 +138,8 @@ private slots:
 
     bool isServer;
     bool useDxCapture;
+    bool isRoomInfoReady;
+
     QString roomId;
     QString localPeerId;