From 7cde5c08075da0e5cf9e244c95b5c32791da6193 Mon Sep 17 00:00:00 2001
From: Clem <clemfern456@gmail.com>
Date: Sat, 2 Sep 2023 17:51:08 +0200
Subject: [PATCH 1/2] fix(terminal) Eugeny/tabby#8912: move frontend clear
 after session initialization (ref ef6b8a4eaa1ce4cf0311649d009d1a8a3e66a71c
 Eugeny/tabby#8726)

---
 .../src/api/connectableTerminalTab.component.ts    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tabby-terminal/src/api/connectableTerminalTab.component.ts b/tabby-terminal/src/api/connectableTerminalTab.component.ts
index cefd3e71..fa559b93 100644
--- a/tabby-terminal/src/api/connectableTerminalTab.component.ts
+++ b/tabby-terminal/src/api/connectableTerminalTab.component.ts
@@ -46,7 +46,9 @@ export abstract class ConnectableTerminalTabComponent<P extends ConnectableTermi
     }
 
     protected onFrontendReady (): void {
-        this.initializeSession()
+        this.initializeSession().then(() => {
+            this.clearServiceMessagesOnConnect()
+        })
         super.onFrontendReady()
     }
 
@@ -57,9 +59,6 @@ export abstract class ConnectableTerminalTabComponent<P extends ConnectableTermi
     async initializeSession (): Promise<void> {
         this.reconnectOffered = false
         this.isDisconnectedByHand = false
-        if (this.profile.clearServiceMessagesOnConnect) {
-            this.frontend?.clear()
-        }
     }
 
     /**
@@ -119,7 +118,14 @@ export abstract class ConnectableTerminalTabComponent<P extends ConnectableTermi
     async reconnect (): Promise<void> {
         this.session?.destroy()
         await this.initializeSession()
+        this.clearServiceMessagesOnConnect()
         this.session?.releaseInitialDataBuffer()
     }
 
+    private clearServiceMessagesOnConnect (): void {
+        if (this.profile.clearServiceMessagesOnConnect) {
+            this.frontend?.clear()
+        }
+    }
+
 }

From 04b53ab3661ab3b353c0b77f34a725a2b8c9167e Mon Sep 17 00:00:00 2001
From: Clem <clemfern456@gmail.com>
Date: Sat, 2 Sep 2023 20:52:25 +0200
Subject: [PATCH 2/2] ref(terminal) 7cde5c08075da0e5cf9e244c95b5c32791da6193:
 clear service message on connection succeeds only

---
 tabby-terminal/src/api/connectableTerminalTab.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tabby-terminal/src/api/connectableTerminalTab.component.ts b/tabby-terminal/src/api/connectableTerminalTab.component.ts
index fa559b93..cd22817e 100644
--- a/tabby-terminal/src/api/connectableTerminalTab.component.ts
+++ b/tabby-terminal/src/api/connectableTerminalTab.component.ts
@@ -123,7 +123,7 @@ export abstract class ConnectableTerminalTabComponent<P extends ConnectableTermi
     }
 
     private clearServiceMessagesOnConnect (): void {
-        if (this.profile.clearServiceMessagesOnConnect) {
+        if (this.profile.clearServiceMessagesOnConnect && this.session?.open) {
             this.frontend?.clear()
         }
     }