Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2014-07-21 07:17:49 -0400
committerUwe Stieber2014-07-21 07:17:49 -0400
commitd8459b49d147c94baa877f455af893406ec9efca (patch)
tree3d3f60ca486ef9d8d8397c3041abbb316939727a
parent6f84c7afe43a1bb6e739abdb2bcf99d6342ec418 (diff)
downloadorg.eclipse.tcf-d8459b49d147c94baa877f455af893406ec9efca.tar.gz
org.eclipse.tcf-d8459b49d147c94baa877f455af893406ec9efca.tar.xz
org.eclipse.tcf-d8459b49d147c94baa877f455af893406ec9efca.zip
Terminals: Fix cancelling the custom encoding dialog for the encoding selection to fall back to ISO-8859-1
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java
index be515d53a..2d877bc6c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java
@@ -524,7 +524,12 @@ public abstract class AbstractConfigurationPanel extends AbstractWizardConfigura
int index = SWTControlUtil.indexOf(encodingCombo, "ISO-8859-1".equals(encoding) ? "Default (ISO-8859-1)" : encoding); //$NON-NLS-1$ //$NON-NLS-2$
if (index != -1) SWTControlUtil.select(encodingCombo, index);
- else SWTControlUtil.setText(encodingCombo, encoding);
+ else {
+ SWTControlUtil.add(encodingCombo, encoding, SWTControlUtil.getItemCount(encodingCombo) - 1);
+ SWTControlUtil.select(encodingCombo, SWTControlUtil.indexOf(encodingCombo, encoding));
+ }
+
+ lastSelectedEncoding = SWTControlUtil.getText(encodingCombo);
}
/**

Back to the top