Fix duplicate file crash (#2)

minetest-tools · Dec 30, 2018 · 2d846f2 · 2d846f2
1 parent 1de3af3
commit 2d846f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ DIST := \
 	mtmediasrv.conf
 
 PROJECT := mtmediasrv
-VERSION = 4
+VERSION = 5
 BUILD = `git describe --tags --always`
 
 $(PROJECT): main.go

diff --git a/main.go b/main.go
@@ -180,9 +180,13 @@ func collectMedia(l bool, c bool, e map[string]bool, w string) filepath.WalkFunc
 			if l {
 				err := os.Link(path, of)
 				if err != nil {
-					return err
+					if err != os.ErrExist {
+						return err
+					}
+				}
+				if err != os.ErrExist {
+					newmedia++
 				}
-				newmedia++
 			} else if c {
 				in, err := os.Open(path)
 				if err != nil {