From 645531acc035d88cacff7c7db5ff11c8b0f6547e Mon Sep 17 00:00:00 2001
From: Eugene Pankov <e@ajenti.org>
Date: Wed, 23 Feb 2022 20:51:17 +0100
Subject: [PATCH] ssh: fixed missing service messages - fixes #5798

---
 tabby-ssh/src/components/sshTab.component.ts | 3 +--
 tabby-ssh/src/session/shell.ts               | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tabby-ssh/src/components/sshTab.component.ts b/tabby-ssh/src/components/sshTab.component.ts
index 66acde1dc..8bc0eaba1 100644
--- a/tabby-ssh/src/components/sshTab.component.ts
+++ b/tabby-ssh/src/components/sshTab.component.ts
@@ -200,13 +200,12 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
         }
 
         const session = new SSHShellSession(this.injector, this.sshSession)
-
+        this.setSession(session)
         this.attachSessionHandler(session.serviceMessage$, msg => {
             this.write(`\r${colors.black.bgWhite(' SSH ')} ${msg}\r\n`)
             session.resize(this.size.columns, this.size.rows)
         })
 
-        this.setSession(session)
         await session.start()
         this.session?.resize(this.size.columns, this.size.rows)
     }
diff --git a/tabby-ssh/src/session/shell.ts b/tabby-ssh/src/session/shell.ts
index 366917511..2f4c9cfdc 100644
--- a/tabby-ssh/src/session/shell.ts
+++ b/tabby-ssh/src/session/shell.ts
@@ -24,6 +24,7 @@ export class SSHShellSession extends BaseSession {
         this.ssh = ssh
         this.profile = ssh.profile
         this.setLoginScriptsOptions(this.profile.options)
+        this.ssh.serviceMessage$.subscribe(m => this.serviceMessage.next(m))
     }
 
     async start (): Promise<void> {