Merge branch 'master' into develop

This commit is contained in:
Torkel Ödegaard
2017-10-26 15:59:50 +02:00
94 changed files with 1790 additions and 13092 deletions

View File

@@ -129,7 +129,9 @@ func RenderToPng(params *RenderOpts) (string, error) {
done := make(chan error)
go func() {
cmd.Wait()
if err := cmd.Wait(); err != nil {
rendererLog.Error("failed to render an image", "error", err)
}
close(done)
}()