fix6

orestonce · Nov 19, 2023 · 4e02c29 · 4e02c29
1 parent b82cc35
commit 4e02c29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/api.go b/api.go
@@ -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()

diff --git a/m3u8d-qt/mainwindow.cpp b/m3u8d-qt/mainwindow.cpp
@@ -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);
 }