GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-10-04 14:04:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed AppService.selectTab crash

Browse Source
This commit is contained in:
Eugene Pankov
2021-01-03 20:53:53 +01:00
parent aaab475e5f
commit c6331c9b1c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
terminus-core/src/services/app.service.ts
View File

@@ -49,10 +49,10 @@ export class AppService {
get activeTab (): BaseTabComponent|null { return this._activeTab ?? null } get activeTab (): BaseTabComponent|null { return this._activeTab ?? null }
private lastTabIndex = 0 private lastTabIndex = 0
private _activeTab?: BaseTabComponent private _activeTab: BaseTabComponent | null = null
private closedTabsStack: RecoveryToken[] = [] private closedTabsStack: RecoveryToken[] = []
private activeTabChange = new Subject<BaseTabComponent>() private activeTabChange = new Subject<BaseTabComponent|null>()
private tabsChanged = new Subject<void>() private tabsChanged = new Subject<void>()
private tabOpened = new Subject<BaseTabComponent>() private tabOpened = new Subject<BaseTabComponent>()
private tabClosed = new Subject<BaseTabComponent>() private tabClosed = new Subject<BaseTabComponent>()
@@ -60,7 +60,7 @@ export class AppService {
private completionObservers = new Map<BaseTabComponent, CompletionObserver>() 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 tabOpened$ (): Observable<BaseTabComponent> { return this.tabOpened }
get tabsChanged$ (): Observable<void> { return this.tabsChanged } get tabsChanged$ (): Observable<void> { return this.tabsChanged }
get tabClosed$ (): Observable<BaseTabComponent> { return this.tabClosed } get tabClosed$ (): Observable<BaseTabComponent> { return this.tabClosed }
@@ -185,8 +185,8 @@ export class AppService {
return null return null
} }
selectTab (tab: BaseTabComponent): void { selectTab (tab: BaseTabComponent|null): void {
if (this._activeTab === tab) { if (tab && this._activeTab === tab) {
this._activeTab.emitFocused() this._activeTab.emitFocused()
return return
} }
@@ -204,7 +204,7 @@ export class AppService {
setImmediate(() => { setImmediate(() => {
this._activeTab?.emitFocused() this._activeTab?.emitFocused()
}) })
this.hostApp.setTitle(this._activeTab.title) this.hostApp.setTitle(this._activeTab?.title)
} }
getParentTab (tab: BaseTabComponent): SplitTabComponent|null { getParentTab (tab: BaseTabComponent): SplitTabComponent|null {

4
terminus-core/src/services/hostApp.service.ts
View File

@@ -242,8 +242,8 @@ export class HostAppService {
this.electron.ipcRenderer.send('window-set-vibrancy', enable, type) this.electron.ipcRenderer.send('window-set-vibrancy', enable, type)
} }
setTitle (title: string): void { setTitle (title?: string): void {
this.electron.ipcRenderer.send('window-set-title', title) this.electron.ipcRenderer.send('window-set-title', title ?? 'Terminus')
} }
setTouchBar (touchBar: TouchBar): void { setTouchBar (touchBar: TouchBar): void {