From 37acc66edce0d76ac364d9121d4491853f2e2542 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 25 Jun 2019 19:41:55 +0200 Subject: ui: remove clone --- ui/editdialog.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'ui/editdialog.go') diff --git a/ui/editdialog.go b/ui/editdialog.go index f1d7fac5..f27ab60f 100644 --- a/ui/editdialog.go +++ b/ui/editdialog.go @@ -28,11 +28,11 @@ type EditDialog struct { blockUntunneledTraficCheckGuard bool } -func runTunnelEditDialog(owner walk.Form, tunnel *manager.Tunnel, clone bool) *conf.Config { +func runTunnelEditDialog(owner walk.Form, tunnel *manager.Tunnel) *conf.Config { dlg := &EditDialog{} var title string - if tunnel == nil || clone { + if tunnel == nil { title = "Create new tunnel" } else { title = "Edit tunnel" @@ -44,9 +44,6 @@ func runTunnelEditDialog(owner walk.Form, tunnel *manager.Tunnel, clone bool) *c dlg.config = conf.Config{Interface: conf.Interface{PrivateKey: *pk}} } else { dlg.config, _ = tunnel.StoredConfig() - if clone { - dlg.config.Name += "-copy" - } } layout := walk.NewGridLayout() @@ -113,11 +110,7 @@ func runTunnelEditDialog(owner walk.Form, tunnel *manager.Tunnel, clone bool) *c dlg.syntaxEdit.BlockUntunneledTrafficStateChanged().Attach(dlg.onBlockUntunneledTrafficStateChanged) dlg.syntaxEdit.SetText(dlg.config.ToWgQuick()) - if clone { - dlg.config.Name = "" - } - - if tunnel != nil && !clone { + if tunnel != nil { dlg.nameEdit.SetFocus() // TODO: This works around a walk issue with scrolling in weird ways . We should fix this in walk instead of here. dlg.Starting().Attach(func() { -- cgit v1.2.3-59-g8ed1b