YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-26 12:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash during rejoin connection

Browse Source
This commit is contained in:
dijunkun
2023-10-10 17:09:24 +08:00
parent cb842276e8
commit 7216d318b4
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
remote_desk_gui/main.cpp
View File

@@ -1,7 +1,8 @@
#include <SDL.h> #include <SDL.h>
#include <stdio.h> #include <stdio.h>
#ifdef _WIN32 #ifdef _WIN32
#pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"") // #pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"")
#pragma comment(linker, "/subsystem:\"console\"")
#include <Winsock2.h> #include <Winsock2.h>
#include <iphlpapi.h> #include <iphlpapi.h>
#elif __APPLE__ #elif __APPLE__
@@ -237,10 +238,10 @@ void ReceiveDataBuffer(const char *data, size_t size, const char *user_id,
ip.mi.time = 0; ip.mi.time = 0;
// Set cursor pos // Set cursor pos
SetCursorPos(ip.mi.dx, ip.mi.dy); // SetCursorPos(ip.mi.dx, ip.mi.dy);
// Send the press // Send the press
if (ip.mi.dwFlags != MOUSEEVENTF_MOVE) { if (ip.mi.dwFlags != MOUSEEVENTF_MOVE) {
SendInput(1, &ip, sizeof(INPUT)); // SendInput(1, &ip, sizeof(INPUT));
} }
std::cout << "Receive data from [" << user << "], " << ip.type << " " std::cout << "Receive data from [" << user << "], " << ip.type << " "
@@ -370,7 +371,12 @@ int main() {
GetMac(mac_addr); GetMac(mac_addr);
peer_server = CreatePeer(&params); peer_server = CreatePeer(&params);
std::string server_user_id = "S-" + std::string(GetMac(mac_addr));
Init(peer_server, server_user_id.c_str());
peer_client = CreatePeer(&params); peer_client = CreatePeer(&params);
std::string client_user_id = "C-" + std::string(GetMac(mac_addr));
Init(peer_client, client_user_id.c_str());
// Setup SDL // Setup SDL
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) != if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) !=
@@ -478,7 +484,7 @@ int main() {
std::string user_id = "S-" + std::string(GetMac(mac_addr)); std::string user_id = "S-" + std::string(GetMac(mac_addr));
if (strcmp(online_label, "Online") == 0) { if (strcmp(online_label, "Online") == 0) {
CreateConnection(peer_server, mac_addr, user_id.c_str()); CreateConnection(peer_server, mac_addr);
nv12_buffer_ = new char[NV12_BUFFER_SIZE]; nv12_buffer_ = new char[NV12_BUFFER_SIZE];
#ifdef _WIN32 #ifdef _WIN32
@@ -554,7 +560,7 @@ int main() {
if (ImGui::Button(connect_label)) { if (ImGui::Button(connect_label)) {
if (strcmp(connect_label, "Connect") == 0 && !joined) { if (strcmp(connect_label, "Connect") == 0 && !joined) {
std::string user_id = "C-" + std::string(GetMac(mac_addr)); std::string user_id = "C-" + std::string(GetMac(mac_addr));
JoinConnection(peer_client, buf, user_id.c_str()); JoinConnection(peer_client, buf);
joined = true; joined = true;
} else if (strcmp(connect_label, "Disconnect") == 0 && joined) { } else if (strcmp(connect_label, "Disconnect") == 0 && joined) {
LeaveConnection(peer_client); LeaveConnection(peer_client);