Skip to content

Commit d2688a3

Browse files
committed
fix: fixed updating the remote address that causes it to be impossible to select the address by double-clicking
1 parent def91f6 commit d2688a3

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

Modules/Net/popup.swift

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,14 @@ internal class Popup: PopupWrapper {
455455
}
456456
}
457457

458-
if self.localIPField?.stringValue != value.laddr {
459-
self.localIPField?.stringValue = value.laddr ?? localizedString("Unknown")
458+
var privateIP = localizedString("Unknown")
459+
if let v4 = value.laddr.v4, !v4.isEmpty {
460+
privateIP = v4
461+
} else if let v6 = value.laddr.v6, !v6.isEmpty {
462+
privateIP = v6
463+
}
464+
if self.localIPField?.stringValue != privateIP {
465+
self.localIPField?.stringValue = privateIP
460466
}
461467

462468
if let view = self.publicIPv4View {
@@ -465,11 +471,12 @@ internal class Popup: PopupWrapper {
465471
self.addressView?.addArrangedSubview(view)
466472
self.recalculateHeight()
467473
}
468-
if self.publicIPv4Field?.stringValue != addr {
469-
self.publicIPv4Field?.stringValue = addr
470-
if let cc = value.raddr.countryCode {
471-
self.publicIPv4Field?.stringValue += " (\(cc))"
472-
}
474+
var ip = addr
475+
if let cc = value.raddr.countryCode {
476+
ip += " (\(cc))"
477+
}
478+
if self.publicIPv4Field?.stringValue != ip {
479+
self.publicIPv4Field?.stringValue = ip
473480
}
474481
} else if view.superview != nil {
475482
view.removeFromSuperview()
@@ -484,8 +491,12 @@ internal class Popup: PopupWrapper {
484491
self.addressView?.addArrangedSubview(view)
485492
resized = true
486493
}
487-
if self.publicIPv6Field?.stringValue != addr {
488-
self.publicIPv6Field?.stringValue = addr
494+
var ip = addr
495+
if let cc = value.raddr.countryCode {
496+
ip += " (\(cc))"
497+
}
498+
if self.publicIPv6Field?.stringValue != ip {
499+
self.publicIPv6Field?.stringValue = ip
489500
}
490501
} else if view.superview != nil {
491502
view.removeFromSuperview()

0 commit comments

Comments
 (0)