From eb46d4278b893b05d09d18e1d79a6ed2b414202a Mon Sep 17 00:00:00 2001
From: ac79b0c6 <105047743+ac79b0c6@users.noreply.github.com>
Date: Sun, 1 Jan 2023 11:05:31 +0800
Subject: update mkvtool:fix bug.

---
 mkvlib/mkv.go    | 19 ++++++++++++-------
 mkvlib/shared.go |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/mkvlib/mkv.go b/mkvlib/mkv.go
index 0bbedde..28a38f2 100644
--- a/mkvlib/mkv.go
+++ b/mkvlib/mkv.go
@@ -343,17 +343,22 @@ func (self *mkvProcessor) MakeMKVs(dir, data, output, slang, stitle string, subs
 		}
 		p = path.Join(data, d, f)
 		_p := path.Join(p, "subsetted")
-		subs, _ := findPath(p, `\.(sub)|(pgs)`)
 		asses, _ := findPath(_p, `\.ass$`)
-		if len(asses) == 0 && subset {
+		attachments := findFonts(_p)
+		if len(asses) == 0 {
 			asses, _ = findPath(p, `\.ass$`)
-			if !self.ASSFontSubset(asses, "", "", false, lcb) {
-				ok = false
-				continue
+			if subset {
+				if !self.ASSFontSubset(asses, "", "", false, lcb) {
+					ok = false
+					continue
+				}
+				asses, _ = findPath(_p, `\.ass$`)
+				attachments = findFonts(_p)
+			} else {
+				attachments = findFonts(path.Join(p, "fonts"))
 			}
-			asses, _ = findPath(_p, `\.ass$`)
 		}
-		attachments := findFonts(_p)
+		subs, _ := findPath(p, `\.(sub)|(pgs)`)
 		tracks := append(subs, asses...)
 		if !self.CreateMKV(item, tracks, attachments, fn, slang, stitle, true) {
 			ok = false
diff --git a/mkvlib/shared.go b/mkvlib/shared.go
index 9ad02cb..5318450 100644
--- a/mkvlib/shared.go
+++ b/mkvlib/shared.go
@@ -12,7 +12,7 @@ import (
 )
 
 const libName = "mkvlib"
-const libVer = "v2.2.4"
+const libVer = "v2.2.5"
 
 const LibFName = libName + " " + libVer
 
-- 
cgit v1.2.1