From e64d0a0415b55b3a9ddba0844d6b80ffe6ecf9da Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
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.feature/feature.xml        | 2 +-
 .../org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF    | 2 +-
 .../ui/internal/dialogs/LaunchTerminalSettingsDialog.java   | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
index df558232ec1..bac30497716 100644
--- a/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
@@ -11,7 +11,7 @@
 <feature
       id="org.eclipse.tm.terminal.view.feature"
       label="%featureName"
-      version="4.6.0.qualifier"
+      version="4.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.tm.terminal.view.ui"
       license-feature="org.eclipse.license"
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..0404a182cc3 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.1.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);
 		}
 	}