From b3cf8602042432b92690afd74a87edee0a29e36f Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 14 Nov 2023 16:55:47 -0500 Subject: [PATCH] Add a missing null check since terminal properties can be null Removes a redundant map lookup too. Fixes #617 --- .../terminal/view/ui/tabs/TabTerminalListener.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java index 717d51c6152..96946641d71 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java @@ -127,13 +127,11 @@ private void updateTitle(final String title, final TerminalTitleRequestor reques // Get the original terminal properties associated with the tab item @SuppressWarnings({ "unchecked" }) final Map properties = (Map) item.getData("properties"); //$NON-NLS-1$ - if (properties.containsKey(ITerminalsConnectorConstants.PROP_TITLE_DISABLE_ANSI_TITLE)) { - if (properties.get( - ITerminalsConnectorConstants.PROP_TITLE_DISABLE_ANSI_TITLE) instanceof Boolean disableAnsi) { - // Check if terminal title can be updated from ANSI escape sequence - if (disableAnsi && requestor == TerminalTitleRequestor.ANSI) { - return; - } + if (properties != null && properties + .get(ITerminalsConnectorConstants.PROP_TITLE_DISABLE_ANSI_TITLE) instanceof Boolean disableAnsi) { + // Check if terminal title can be updated from ANSI escape sequence + if (disableAnsi && requestor == TerminalTitleRequestor.ANSI) { + return; } }