From f9e06b7ced8dc1af1ab7e0d05bd487be6beaf1f2 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 10 Oct 2023 16:48:10 -0800 Subject: [PATCH] Prevent terminal being created twice I missed this in code review. --- site/src/pages/TerminalPage/TerminalPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/src/pages/TerminalPage/TerminalPage.tsx b/site/src/pages/TerminalPage/TerminalPage.tsx index 958d7ef7329e7..dfc52c8a91e24 100644 --- a/site/src/pages/TerminalPage/TerminalPage.tsx +++ b/site/src/pages/TerminalPage/TerminalPage.tsx @@ -154,7 +154,7 @@ const TerminalPage: FC = () => { // Create the terminal! useEffect(() => { - if (!xtermRef.current) { + if (!xtermRef.current || config.isLoading) { return; } const terminal = new XTerm.Terminal({ @@ -210,7 +210,7 @@ const TerminalPage: FC = () => { window.removeEventListener("resize", listener); terminal.dispose(); }; - }, [config.data, sendEvent, xtermRef, handleWebLink]); + }, [config.data, config.isLoading, sendEvent, xtermRef, handleWebLink]); // Triggers the initial terminal connection using // the reconnection token and workspace name found