From 785ca7a01d32763986a5cfdba66dfb9e541f37e0 Mon Sep 17 00:00:00 2001 From: talksik Date: Fri, 20 May 2022 06:34:07 -0500 Subject: [PATCH] making sure to untuned from certain channels when escaping --- packages/desktop/src/providers/TerminalProvider.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/desktop/src/providers/TerminalProvider.tsx b/packages/desktop/src/providers/TerminalProvider.tsx index 0debaae..761fe5d 100644 --- a/packages/desktop/src/providers/TerminalProvider.tsx +++ b/packages/desktop/src/providers/TerminalProvider.tsx @@ -342,9 +342,16 @@ export function TerminalProvider({ children }: { children: React.ReactChild }) { // handle shortcuts const clearMind = useCallback(() => { - setSelectedLineId(undefined); + setSelectedLineId((prevLineId) => { + // untune from the last line if it was just a temporary tuned one + if (roomMap[prevLineId]?.currentUserMember.state === LineMemberState.INBOX) { + handleUntuneFromLine(prevLineId); + } + + return undefined; + }); setShowNewChannelForm(false); - }, [setSelectedLineId, setShowNewChannelForm]); + }, [setSelectedLineId, setShowNewChannelForm, handleUntuneFromLine, roomMap]); useKeyPressEvent('Escape', clearMind);