From c6331c9b1c203d5aa31cb40843bb8d1ed3c8d1a0 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <john.pankov@gmail.com>
Date: Sun, 3 Jan 2021 20:53:53 +0100
Subject: [PATCH] fixed AppService.selectTab crash

---
 terminus-core/src/services/app.service.ts     | 12 ++++++------
 terminus-core/src/services/hostApp.service.ts |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/terminus-core/src/services/app.service.ts b/terminus-core/src/services/app.service.ts
index 4b80cd9a..4a9cd43a 100644
--- a/terminus-core/src/services/app.service.ts
+++ b/terminus-core/src/services/app.service.ts
@@ -49,10 +49,10 @@ export class AppService {
     get activeTab (): BaseTabComponent|null { return this._activeTab ?? null }
 
     private lastTabIndex = 0
-    private _activeTab?: BaseTabComponent
+    private _activeTab: BaseTabComponent | null = null
     private closedTabsStack: RecoveryToken[] = []
 
-    private activeTabChange = new Subject<BaseTabComponent>()
+    private activeTabChange = new Subject<BaseTabComponent|null>()
     private tabsChanged = new Subject<void>()
     private tabOpened = new Subject<BaseTabComponent>()
     private tabClosed = new Subject<BaseTabComponent>()
@@ -60,7 +60,7 @@ export class AppService {
 
     private completionObservers = new Map<BaseTabComponent, CompletionObserver>()
 
-    get activeTabChange$ (): Observable<BaseTabComponent> { return this.activeTabChange }
+    get activeTabChange$ (): Observable<BaseTabComponent|null> { return this.activeTabChange }
     get tabOpened$ (): Observable<BaseTabComponent> { return this.tabOpened }
     get tabsChanged$ (): Observable<void> { return this.tabsChanged }
     get tabClosed$ (): Observable<BaseTabComponent> { return this.tabClosed }
@@ -185,8 +185,8 @@ export class AppService {
         return null
     }
 
-    selectTab (tab: BaseTabComponent): void {
-        if (this._activeTab === tab) {
+    selectTab (tab: BaseTabComponent|null): void {
+        if (tab && this._activeTab === tab) {
             this._activeTab.emitFocused()
             return
         }
@@ -204,7 +204,7 @@ export class AppService {
         setImmediate(() => {
             this._activeTab?.emitFocused()
         })
-        this.hostApp.setTitle(this._activeTab.title)
+        this.hostApp.setTitle(this._activeTab?.title)
     }
 
     getParentTab (tab: BaseTabComponent): SplitTabComponent|null {
diff --git a/terminus-core/src/services/hostApp.service.ts b/terminus-core/src/services/hostApp.service.ts
index 99e9802c..507c5385 100644
--- a/terminus-core/src/services/hostApp.service.ts
+++ b/terminus-core/src/services/hostApp.service.ts
@@ -242,8 +242,8 @@ export class HostAppService {
         this.electron.ipcRenderer.send('window-set-vibrancy', enable, type)
     }
 
-    setTitle (title: string): void {
-        this.electron.ipcRenderer.send('window-set-title', title)
+    setTitle (title?: string): void {
+        this.electron.ipcRenderer.send('window-set-title', title ?? 'Terminus')
     }
 
     setTouchBar (touchBar: TouchBar): void {