summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurenai <[email protected]>2021-10-14 21:54:13 +0800
committerKurenai <[email protected]>2021-10-14 21:54:13 +0800
commit2e0da3d465152e44f06d06f128875728c7deaf81 (patch)
treeaee1506d25111d8146f0e03c7718f0bc4ad67ffb
parent6ed59f73a2f6a53246ff29fdca0a73f3208352f8 (diff)
fix a logic bomb.
-rw-r--r--ass.go10
-rw-r--r--main.go2
2 files changed, 6 insertions, 6 deletions
diff --git a/ass.go b/ass.go
index 3395bb4..435b560 100644
--- a/ass.go
+++ b/ass.go
@@ -240,11 +240,6 @@ func (self *ass) createFontSubset(font *fontInfo) bool {
if e == ".ttc" {
e = ".ttf"
}
- err := os.RemoveAll(self.output)
- if !(err == nil || err == os.ErrNotExist) {
- log.Println("Failed to clean the output folder.")
- return false
- }
if os.MkdirAll(self.output, os.ModePerm) != nil {
log.Println("Failed to create the output folder.")
return false
@@ -275,6 +270,11 @@ func (self *ass) createFontSubset(font *fontInfo) bool {
}
func (self *ass) createFontsSubset() bool {
+ err := os.RemoveAll(self.output)
+ if !(err == nil || err == os.ErrNotExist) {
+ log.Println("Failed to clean the output folder.")
+ return false
+ }
ok := 0
l := len(self.m)
wg := new(sync.WaitGroup)
diff --git a/main.go b/main.go
index 750b4d7..b8d54b1 100644
--- a/main.go
+++ b/main.go
@@ -7,7 +7,7 @@ import (
"runtime"
)
-const pName = "MKV Tool v3.0.1"
+const pName = "MKV Tool v3.0.2"
type arrayArg []string