Merge branch 'master' into nosocat

4 years ago · aaeac9b852
parent e035adb07f 742fd1cea5
commit aaeac9b852
1 changed files with 1 additions and 1 deletions
--- a/d4-goclient.go
+++ b/d4-goclient.go
@ -203,7 +203,7 @@ func d4loadConfig(d4 *d4S) bool {
 	(*d4).conf = d4params{}
 	(*d4).conf.source = string(readConfFile(d4, "source"))
 	(*d4).conf.destination = string(readConfFile(d4, "destination"))
-	tmpu, err := uuid.FromBytes(readConfFile(d4, "uuid"))
+	tmpu, err := uuid.FromString(string(readConfFile(d4, "uuid")))
 	if err != nil {
 		// generate new uuid
 		(*d4).conf.uuid = generateUUIDv4()