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

[fix] fix program cannot exit when click close button due to screen capture thread is running

Browse Source
This commit is contained in:
dijunkun
2024-08-02 14:38:31 +08:00
parent 88cd4aca4a
commit 502a90f121
7 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/single_window/render.cpp
View File

@@ -143,7 +143,8 @@ int Render::StartScreenCapture() {
int Render::StopScreenCapture() {
if (screen_capturer_) {
LOG_INFO("Destroy screen capturer")
LOG_INFO("Stop screen capturer")
screen_capturer_->Stop();
screen_capturer_->Destroy();
delete screen_capturer_;
screen_capturer_ = nullptr;
@@ -483,7 +484,7 @@ int Render::Run() {
if (streaming_) {
LOG_INFO("Return to main interface");
streaming_ = false;
LeaveConnection(peer_reserved_);
LeaveConnection(peer_reserved_ ? peer_reserved_ : peer_);
rejoin_ = false;
memset(audio_buffer_, 0, 960);
connection_established_ = false;
@@ -506,10 +507,9 @@ int Render::Run() {
if (video_width * 9 < video_height * 16) {
stream_render_rect_.x = 0;
stream_render_rect_.y = abs(video_height - video_width * 9 / 16) / 2 +
fullscreen_button_pressed_
? 0
: title_bar_height_;
stream_render_rect_.y =
abs(video_height - video_width * 9 / 16) / 2 +
(fullscreen_button_pressed_ ? 0 : title_bar_height_);
stream_render_rect_.w = video_width;
stream_render_rect_.h = video_width * 9 / 16;
} else if (video_width * 9 > video_height * 16) {

2
src/single_window/render_callback_func.cpp
View File

@@ -124,6 +124,7 @@ void Render::OnReceiveVideoBufferCb(const char *data, size_t size,
event.type = REFRESH_EVENT;
SDL_PushEvent(&event);
render->received_frame_ = true;
render->streaming_ = true;
}
}
@@ -180,7 +181,6 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, void *user_data) {
} else if (ConnectionStatus::Connected == status) {
render->connection_status_str_ = "Connected";
render->connection_established_ = true;
render->streaming_ = true;
if (render->peer_reserved_ || !render->is_client_mode_) {
render->start_screen_capture_ = true;