Save original address string and reuse it in Windows UI.

pull/10/head
Icedream 2016-05-20 12:59:06 +02:00
parent d7c14fd3b7
commit 655d7cb094
2 changed files with 4 additions and 7 deletions

View File

@ -22,8 +22,9 @@ var (
"Server IP/hostname and port, written as \"server:port\".") "Server IP/hostname and port, written as \"server:port\".")
argPassword = kingpin.Arg("password", "The RCON password.") argPassword = kingpin.Arg("password", "The RCON password.")
address *net.UDPAddr address *net.UDPAddr
password string addressStr string
password string
socket *net.UDPConn socket *net.UDPConn
socketBuffer = make([]byte, 64*1024) socketBuffer = make([]byte, 64*1024)
@ -39,7 +40,7 @@ func initSocketAddr(addr string) (err error) {
return return
} }
address = newAddr address, addressStr = newAddr, addr
return return
} }

View File

@ -91,10 +91,6 @@ func runGraphicalUi() (err error) {
return return
} }
connectAction.Triggered().Attach(func() { connectAction.Triggered().Attach(func() {
addressStr := ""
if address != nil {
addressStr = address.String()
}
result, addr, pw, err := runConnectDialog(addressStr, password, dlg) result, addr, pw, err := runConnectDialog(addressStr, password, dlg)
if err != nil { if err != nil {
uiLogError(fmt.Sprintf("Failed to run connect dialog: %s", err)) uiLogError(fmt.Sprintf("Failed to run connect dialog: %s", err))