From 3b2f739316e0012053fc9f47e97da246b9a398c0 Mon Sep 17 00:00:00 2001 From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com> Date: Sat, 21 Dec 2024 19:09:41 +0100 Subject: [PATCH] Cancleing file dialog produces nil `w` --- internal/gui/save.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/internal/gui/save.go b/internal/gui/save.go index a8eabd1..2f6bac6 100644 --- a/internal/gui/save.go +++ b/internal/gui/save.go @@ -25,11 +25,15 @@ func savePdf(doc document.Document) func() { } dialog := dialog.NewFileSave(func(w fyne.URIWriteCloser, err error) { - if w == nil || err != nil { + if err != nil { setStatus("error.writingPdf", fmt.Errorf("writing PDF: %w", err)) return } + if w == nil { + return + } + saveLastUsedDirectory(w.URI()) _, err = w.Write(pdf) @@ -73,11 +77,15 @@ func saveXlsx(doc document.Document) func() { } dialog := dialog.NewFileSave(func(w fyne.URIWriteCloser, err error) { - if w == nil || err != nil { + if err != nil { setStatus("error.writingXlsx", fmt.Errorf("writing xlsx: %w", err)) return } + if w == nil { + return + } + saveLastUsedDirectory(w.URI()) _, err = w.Write(excel)