use the same filename proposal function also for new contest logs

ftl · Jun 24, 2023 · 8fd04cb · 8fd04cb
1 parent 3a4da51
commit 8fd04cb
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/app/app.go b/core/app/app.go
@@ -341,7 +341,11 @@ func (c *Controller) Quit() {
 }
 
 func (c *Controller) proposeFilename() string {
-	result := strings.Join([]string{c.Settings.Contest().Name, c.Settings.Station().Callsign.BaseCall}, " ")
+	return proposeFilename(c.Settings.Contest().Name, c.Settings.Station().Callsign.BaseCall)
+}
+
+func proposeFilename(contestName, callsign string) string {
+	result := strings.Join([]string{contestName, callsign}, " ")
 	result = strings.TrimSpace(result)
 	result = strings.ToUpper(result)
 	result = strings.ReplaceAll(result, " ", "_")
@@ -361,7 +365,7 @@ func (c *Controller) New() {
 	} else {
 		proposedName = newContest.Name
 	}
-	proposedFilename := proposedName + ".log"
+	proposedFilename := proposeFilename(proposedName, c.Settings.Station().Callsign.BaseCall) + ".log"
 
 	filename, ok, err := c.view.SelectSaveFile("New Logfile", c.configuration.LogDirectory(), proposedFilename, "*.log")
 	if !ok {