root
/
m3u8d
mirror of https://gitee.com/zhang_1334717033/m3u8d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix6

main v1.19.3
orestonce 2023-11-19 23:46:27 +08:00
parent b82cc35649
commit 4e02c29b59
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api.go
View File

@ -61,6 +61,8 @@ func MergeTsDir(InputTsDir string, OutputMp4Name string) (resp MergeTsDir_Resp)
sort.Strings(tsFileList) // 按照字典顺序排序
if OutputMp4Name == "" {
OutputMp4Name = filepath.Join(InputTsDir, "all.mp4")
} else if !filepath.IsAbs(OutputMp4Name) {
OutputMp4Name = filepath.Join(InputTsDir, OutputMp4Name)
}
ctx, cancelFn := context.WithCancel(context.Background())
defer cancelFn()

1
m3u8d-qt/mainwindow.cpp
View File

@ -206,6 +206,7 @@ void MainWindow::updateMergeUi(bool runing)
ui->lineEdit_mergeDir->setEnabled(!runing);
ui->toolButton_selectMergeDir->setEnabled(!runing);
ui->pushButton_stopMerge->setEnabled(runing);
ui->pushButton_startMerge->setEnabled(!runing);
ui->lineEdit_mergeFileName->setEnabled(!runing);
ui->pushButton_returnDownload->setEnabled(!runing);
}