giffer

commit 47100a988452eb07174da782bcc06797964a4e5d
parent 0b3ea2b71dc4b315c1e7e78f2f1dbc9cb3e9b8d0
Author: Jack Mordaunt <jackmordaunt@gmail.com>
Date:   Thu,  8 Nov 2018 20:23:10 +1300

[!] Send a string error, since repsonse was just sending an empty
object.

Diffstat:
M
cmd/desktop/server.go
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/cmd/desktop/server.go b/cmd/desktop/server.go
@@ -140,14 +140,16 @@ type Gif struct {
 // completes.
 func (g *Gif) Process(fn func() (*RenderedGif, error)) {
 	type done struct {
-		Err error `json:"error,omitempty"`
+		Err string `json:"error,omitempty"`
 	}
 	g.file, g.err = fn()
 	g.subMutex.Lock()
+	var d done
+	if g.err != nil {
+		d.Err = g.err.Error()
+	}
 	for s := range g.subs {
-		err := s.WriteJSON(done{
-			Err: g.err,
-		})
+		err := s.WriteJSON(d)
 		if err != nil {
 			s.Close()
 			delete(g.subs, s)