api.go

@@ -61,8 +61,6 @@ 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()

m3u8d-qt/mainwindow.cpp

@@ -206,7 +206,6 @@ 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);
 }