diff --git a/cmd/d2/watch.go b/cmd/d2/watch.go index 0930caf5b..4e25bed95 100644 --- a/cmd/d2/watch.go +++ b/cmd/d2/watch.go @@ -147,7 +147,6 @@ func (w *watcher) run() error { func (w *watcher) close() { w.wsclientsMu.Lock() - if w.closing { w.wsclientsMu.Unlock() return diff --git a/lib/png/png.go b/lib/png/png.go index d3c0f4a74..0cdc1e872 100644 --- a/lib/png/png.go +++ b/lib/png/png.go @@ -117,7 +117,7 @@ var genPNGScript string func ExportPNG(ms *xmain.State, page playwright.Page, svg []byte) (outputImage []byte, err error) { if page == nil { ms.Log.Error.Printf("Playwright was not initialized properly for PNG export") - return nil, fmt.Errorf("Playwright page is not initialized for png export") + return nil, fmt.Errorf("Playwright page is nil") } encodedSVG := base64.StdEncoding.EncodeToString(svg) @@ -130,7 +130,7 @@ func ExportPNG(ms *xmain.State, page playwright.Page, svg []byte) (outputImage [ pngPrefix := "data:image/png;base64," if !strings.HasPrefix(pngString, pngPrefix) { ms.Log.Error.Printf("failed to convert D2 file to PNG") - return nil, fmt.Errorf("playwright export generated invalid png") + return nil, fmt.Errorf("Playwright export generated invalid png") } splicedPNGString := pngString[len(pngPrefix):] return base64.StdEncoding.DecodeString(splicedPNGString)