Changeset 872 for java/installer2/src/net/oni2/aeinstaller/gui/settings

Timestamp:

May 20, 2013, 11:21:39 AM (11 years ago)

Author:

alloc

Message:

AEI2.14:

• Fixes #51

File:

• java/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java (modified) (3 diffs)

java/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java

@@ -96 +96 @@
         @SuppressWarnings("unused")
         private boolean save() {
+                ProxySettings prox = ProxySettings.getInstance();
 
                 boolean proxyUse = chkUseProxy.isSelected();
@@ -112 +113 @@
                 String proxyHost = txtProxyHost.getText();
 
-                ProxySettings prox = ProxySettings.getInstance();
                 if (!prox.getHostOrIp().equalsIgnoreCase(proxyHost)
                                 || (prox.getPort() != proxyPort)
@@ -123 +123 @@
                         prox.setHostOrIp(proxyHost);
                         prox.setPort(proxyPort);
-                        if (!prox.validate()) {
-                                JOptionPane.showMessageDialog(this,
-                                                bundle.getString("proxyVerifyFailed.text"),
-                                                bundle.getString("proxyVerifyFailed.title"),
-                                                JOptionPane.ERROR_MESSAGE);
-                                prox.setUseProxy(proxyOldUse);
-                                prox.setHostOrIp(proxyOldHost);
-                                prox.setPort(proxyOldPort);
-                                return false;
+                        if (proxyUse) {
+                                if (!prox.validate()) {
+                                        JOptionPane.showMessageDialog(this,
+                                                        bundle.getString("proxyVerifyFailed.text"),
+                                                        bundle.getString("proxyVerifyFailed.title"),
+                                                        JOptionPane.ERROR_MESSAGE);
+                                        prox.setUseProxy(proxyOldUse);
+                                        prox.setHostOrIp(proxyOldHost);
+                                        prox.setPort(proxyOldPort);
+                                        return false;
+                                }
                         }