diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html
index 821997d..c7bb6e3 100644
--- a/package.nw/GridTracker.html
+++ b/package.nw/GridTracker.html
@@ -419,7 +419,7 @@
IP |
- Port |
+ Port |
@@ -434,10 +434,10 @@
e.g. GridTracker on another host |
- IP |
+ IP |
- Port |
+ Port |
Enabled? |
diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index 8183e98..7ddc66e 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -8924,7 +8924,7 @@ function setMulticastEnable(checkbox) {
function setUdpForwardEnable(checkbox) {
if (checkbox.checked) {
- if (ValidatePort(udpForwardPortInput, null, CheckNotLocalPort) && ValidateIPaddress(udpForwardIpInput,
+ if (ValidatePort(udpForwardPortInput, null, CheckForwardPortIsNotReceivePort) && ValidateIPaddress(udpForwardIpInput,
null)) {
g_appSettings.wsjtForwardUdpEnable = checkbox.checked;
return;
@@ -9316,30 +9316,31 @@ function updateBasedOnIni() {
}
}
-function CheckNotRemoteIpPort(value) {
- if (udpForwardIpInput.value == "127.0.0.1" && udpForwardPortInput.value == value && g_appSettings.wsjtIP == "")
- return true;
- return false;
+function CheckReceivePortIsNotForwardPort(value) {
+ if (udpForwardIpInput.value == "127.0.0.1" && udpForwardPortInput.value == value && g_appSettings.wsjtIP == "" && udpForwardEnable.checked) {
+ return false;
+ }
+ return true;
}
-function CheckNotLocalPort(value) {
+function CheckForwardPortIsNotReceivePort(value) {
if (udpForwardIpInput.value == "127.0.0.1" && udpPortInput.value == value && g_appSettings.wsjtIP == "")
- return true;
- return false;
+ return false;
+ return true;
}
function setForwardIp() {
g_appSettings.wsjtForwardUdpIp = udpForwardIpInput.value;
- if (ValidatePort(udpPortInput, null, CheckNotRemoteIpPort)) {
+ if (ValidatePort(udpPortInput, null, CheckReceivePortIsNotForwardPort)) {
setUdpPort();
}
- ValidatePort(udpForwardPortInput, null, CheckNotLocalPort);
+ ValidatePort(udpForwardPortInput, null, CheckForwardPortIsNotReceivePort);
}
function setForwardPort() {
g_appSettings.wsjtForwardUdpPort = udpForwardPortInput.value;
ValidateIPaddress(udpForwardIpInput, null);
- if (ValidatePort(udpPortInput, null, CheckNotRemoteIpPort)) {
+ if (ValidatePort(udpPortInput, null, CheckReceivePortIsNotForwardPort)) {
setUdpPort();
}
}
@@ -9606,7 +9607,7 @@ function ValidateIPaddress(inputText, checkBox) {
function ValidatePort(inputText, checkBox, callBackCheck) {
var value = Number(inputText.value);
if (value > 1023 && value < 65536) {
- if (callBackCheck && callBackCheck(value)) {
+ if (callBackCheck && !callBackCheck(value)) {
inputText.style.color = "#FFF";
inputText.style.backgroundColor = "red";
if (checkBox)
@@ -11213,9 +11214,9 @@ function loadPortSettings()
multicastIpInput.value = g_appSettings.wsjtIP;
setMulticastEnable(multicastEnable);
udpPortInput.value = g_appSettings.wsjtUdpPort;
- ValidatePort(udpPortInput, null, CheckNotRemoteIpPort);
+ ValidatePort(udpPortInput, null, CheckReceivePortIsNotForwardPort);
udpForwardPortInput.value = g_appSettings.wsjtForwardUdpPort;
- ValidatePort(udpForwardPortInput, null, CheckNotLocalPort);
+ ValidatePort(udpForwardPortInput, null, CheckForwardPortIsNotReceivePort);
udpForwardIpInput.value = g_appSettings.wsjtForwardUdpIp;
ValidateIPaddress(udpForwardIpInput, null);
udpForwardEnable.checked = g_appSettings.wsjtForwardUdpEnable;
@@ -11377,7 +11378,7 @@ function checkWsjtxListener() {
g_wsjtCurrentPort = -1;
g_wsjtCurrentIP = "none";
}
- updateWsjtxListener(udpPortInput.value);
+ updateWsjtxListener(g_appSettings.wsjtUdpPort);
}
var g_instances = {};