amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复ffmpeg日志保存目录相关bug

Browse Source 
每次调用addFFmpegSource/getSnap接口时，都可能导致篡改全局配置变量
This commit is contained in:
xia-chu 2023-09-23 20:34:36 +08:00
parent f69f3b3029
commit 585f7c3a3a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/Process.cpp
View File

@ -108,7 +108,7 @@ static int cloneFunc(void *ptr) {
#endif
void Process::run(const string &cmd, string &log_file) {
void Process::run(const string &cmd, string log_file) {
kill(2000);
#ifdef _WIN32
STARTUPINFO si = { 0 };

2
server/Process.h
View File

@ -26,7 +26,7 @@ class Process {
public:
Process();
~Process();
void run(const std::string &cmd, std::string &log_file);
void run(const std::string &cmd, std::string log_file);
void kill(int max_delay,bool force = false);
bool wait(bool block = true);
int exit_code();