From 5376db7190fff4b4a77e592552c76594832810fb Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Thu, 13 Apr 2017 21:30:21 -0700 Subject: [PATCH] thread safety --- gui.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gui.go b/gui.go index 427de57..4684dca 100644 --- a/gui.go +++ b/gui.go @@ -120,22 +120,25 @@ func gui() error { return } + format := []string{"epwing", "edict", "enamdict", "kanjidic"}[formatCombo.Selected()] + if format == "epwing" { + inputPath = filepath.Dir(inputPath) + } + + title := titleEntry.Text() + port := portSpin.Value() + go func() { defer ui.QueueMain(func() { importButton.Enable() }) - format := []string{"epwing", "edict", "enamdict", "kanjidic"}[formatCombo.Selected()] - if format == "epwing" { - inputPath = filepath.Dir(inputPath) - } - - if err := exportDb(inputPath, outputDir, format, titleEntry.Text(), DEFAULT_STRIDE, false); err != nil { + if err := exportDb(inputPath, outputDir, format, title, DEFAULT_STRIDE, false); err != nil { log.Print(err) return } - if err := serveDb(outputDir, portSpin.Value()); err != nil { + if err := serveDb(outputDir, port); err != nil { log.Print(err) return }