From 4e02c29b59041c67da37000c49865c50e6cdb837 Mon Sep 17 00:00:00 2001
From: orestonce <orestonce@163.com>
Date: Sun, 19 Nov 2023 23:46:27 +0800
Subject: [PATCH] fix6

---
 api.go                  | 2 ++
 m3u8d-qt/mainwindow.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/api.go b/api.go
index d7f9f73..cedf4a6 100644
--- 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
index f235feb..453ae8d 100644
--- 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);
 }