From 0aecc5855221ad387937a8044fe60915d6332bf8 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Mon, 4 May 2020 10:36:34 -0400 Subject: [PATCH] Bug 527055: Save terminal settings even when there is only one terminal type Change-Id: I411bb5c815590c7f9929694e0256596b601606fa --- .../org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF | 2 +- .../ui/internal/dialogs/LaunchTerminalSettingsDialog.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF index 60977242750..70f756d6b24 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui;singleton:=true -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.100.qualifier Bundle-Activator: org.eclipse.tm.terminal.view.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java index 446169e9999..b4ef3437951 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java @@ -540,8 +540,10 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { */ protected void saveWidgetValues() { IDialogSettings settings = getDialogSettings(); - if (settings != null && terminals != null) { - settings.put("terminalLabel", terminals.getText()); //$NON-NLS-1$ + if (settings != null) { + if (terminals != null) { + settings.put("terminalLabel", terminals.getText()); //$NON-NLS-1$ + } this.settings.saveWidgetValues(settings, null); } }