Target Explorer: Fix Bug 392244 - [TERMINALS] contents of the "encoding" control is not restored when switching to a saved host config

1 files changed, 4 insertions, 3 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java
index 0ceef4086..55703444f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java
@@ -149,9 +149,10 @@ public class SshWizardConfigurationPanel extends AbstractConfigurationPanel impl
 				if (password != null) {
 					sshSettings.setPassword(password);
 				}
-				if (hostSettings.get(ITerminalsConnectorConstants.PROP_ENCODING) != null) {
-					setEncoding(hostSettings.get(ITerminalsConnectorConstants.PROP_ENCODING));
-				}
+
+				String encoding = hostSettings.get(ITerminalsConnectorConstants.PROP_ENCODING);
+				if (encoding == null || "null".equals(encoding)) encoding = "ISO-8859-1"; //$NON-NLS-1$ //$NON-NLS-2$
+				setEncoding(encoding);
 			} else {
 				sshSettings.setHost(getSelectionHost());
 				sshSettings.setUser(getDefaultUser());