public/gpu-screen-recorder-ui
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder-ui synced 2026-03-31 09:17:04 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix unable to change hotkey settings while recording

Browse Source
This commit is contained in:
dec05eba
2025-04-11 21:51:38 +02:00
parent 90a1272a65
commit 38feee9f29
6 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/GlobalHotkeysLinux.cpp
View File

@@ -1,5 +1,4 @@
#include "../include/GlobalHotkeysLinux.hpp"
#include <signal.h>
#include <sys/wait.h>
#include <fcntl.h>
#include <limits.h>
@@ -71,22 +70,40 @@ namespace gsr {
}
GlobalHotkeysLinux::~GlobalHotkeysLinux() {
for(int i = 0; i < 2; ++i) {
if(read_pipes[i] > 0)
close(read_pipes[i]);
if(write_pipes[i] > 0)
close(write_pipes[i]);
if(write_pipes[PIPE_WRITE] > 0) {
char command[32];
const int command_size = snprintf(command, sizeof(command), "exit\n");
if(write(write_pipes[PIPE_WRITE], command, command_size) != command_size) {
fprintf(stderr, "Error: GlobalHotkeysLinux::~GlobalHotkeysLinux: failed to write command to gsr-global-hotkeys, error: %s\n", strerror(errno));
close_fds();
}
}
if(read_file)
fclose(read_file);
if(process_id > 0) {
kill(process_id, SIGKILL);
int status;
waitpid(process_id, &status, 0);
}
close_fds();
}
void GlobalHotkeysLinux::close_fds() {
for(int i = 0; i < 2; ++i) {
if(read_pipes[i] > 0) {
close(read_pipes[i]);
read_pipes[i] = -1;
}
if(write_pipes[i] > 0) {
close(write_pipes[i]);
write_pipes[i] = -1;
}
}
if(read_file) {
fclose(read_file);
read_file = nullptr;
}
}
bool GlobalHotkeysLinux::start() {

24
src/Overlay.cpp
View File

@@ -1580,9 +1580,9 @@ namespace gsr {
return;
if(is_capture_target_monitor(recording_capture_target.c_str()))
snprintf(msg, sizeof(msg), "Saved recording of this monitor to '%s'", filename.c_str());
snprintf(msg, sizeof(msg), "Saved a recording of this monitor to '%s'", filename.c_str());
else
snprintf(msg, sizeof(msg), "Saved recording of %s to '%s'", recording_capture_target.c_str(), filename.c_str());
snprintf(msg, sizeof(msg), "Saved a recording of %s to '%s'", recording_capture_target.c_str(), filename.c_str());
capture_target = recording_capture_target.c_str();
break;
@@ -1592,9 +1592,9 @@ namespace gsr {
return;
if(is_capture_target_monitor(replay_capture_target.c_str()))
snprintf(msg, sizeof(msg), "Saved replay of this monitor to '%s'", filename.c_str());
snprintf(msg, sizeof(msg), "Saved a replay of this monitor to '%s'", filename.c_str());
else
snprintf(msg, sizeof(msg), "Saved replay of %s to '%s'", replay_capture_target.c_str(), filename.c_str());
snprintf(msg, sizeof(msg), "Saved a replay of %s to '%s'", replay_capture_target.c_str(), filename.c_str());
capture_target = replay_capture_target.c_str();
break;
@@ -1604,9 +1604,9 @@ namespace gsr {
return;
if(is_capture_target_monitor(screenshot_capture_target.c_str()))
snprintf(msg, sizeof(msg), "Saved screenshot of this monitor to '%s'", filename.c_str());
snprintf(msg, sizeof(msg), "Saved a screenshot of this monitor to '%s'", filename.c_str());
else
snprintf(msg, sizeof(msg), "Saved screenshot of %s to '%s'", screenshot_capture_target.c_str(), filename.c_str());
snprintf(msg, sizeof(msg), "Saved a screenshot of %s to '%s'", screenshot_capture_target.c_str(), filename.c_str());
capture_target = screenshot_capture_target.c_str();
break;
@@ -1626,9 +1626,9 @@ namespace gsr {
const std::string filename = filepath_get_filename(replay_saved_filepath);
char msg[512];
if(is_capture_target_monitor(replay_capture_target.c_str()))
snprintf(msg, sizeof(msg), "Saved replay of this monitor to '%s'", filename.c_str());
snprintf(msg, sizeof(msg), "Saved a replay of this monitor to '%s'", filename.c_str());
else
snprintf(msg, sizeof(msg), "Saved replay of %s to '%s'", replay_capture_target.c_str(), filename.c_str());
snprintf(msg, sizeof(msg), "Saved a replay of %s to '%s'", replay_capture_target.c_str(), filename.c_str());
show_notification(msg, notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY, replay_capture_target.c_str());
}
}
@@ -1729,9 +1729,9 @@ namespace gsr {
const std::string filename = filepath_get_filename(screenshot_filepath.c_str());
char msg[512];
if(is_capture_target_monitor(screenshot_capture_target.c_str()))
snprintf(msg, sizeof(msg), "Saved screenshot of this monitor to '%s'", filename.c_str());
snprintf(msg, sizeof(msg), "Saved a screenshot of this monitor to '%s'", filename.c_str());
else
snprintf(msg, sizeof(msg), "Saved screenshot of %s to '%s'", screenshot_capture_target.c_str(), filename.c_str());
snprintf(msg, sizeof(msg), "Saved a screenshot of %s to '%s'", screenshot_capture_target.c_str(), filename.c_str());
show_notification(msg, notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::SCREENSHOT, screenshot_capture_target.c_str());
}
} else {
@@ -1835,9 +1835,9 @@ namespace gsr {
const std::string filename = filepath_get_filename(record_filepath.c_str());
char msg[512];
if(is_capture_target_monitor(recording_capture_target.c_str()))
snprintf(msg, sizeof(msg), "Saved recording of this monitor to '%s'", filename.c_str());
snprintf(msg, sizeof(msg), "Saved a recording of this monitor to '%s'", filename.c_str());
else
snprintf(msg, sizeof(msg), "Saved recording of %s to '%s'", recording_capture_target.c_str(), filename.c_str());
snprintf(msg, sizeof(msg), "Saved a recording of %s to '%s'", recording_capture_target.c_str(), filename.c_str());
show_notification(msg, notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD, recording_capture_target.c_str());
}
} else {