Eugeny/tabby
1
1
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2024-12-26 12:03:31 +03:00
Code Issues Projects Releases Wiki Activity

fixed cwd detection for split tabs

Browse Source
This commit is contained in:
Eugene Pankov 2019-03-08 12:35:14 +01:00
parent e246e22bfd
commit 1a46f0ec3c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
terminus-terminal/src/services/terminal.service.ts
View File

@ -1,7 +1,7 @@
import * as fs from 'mz/fs' import * as fs from 'mz/fs'
import { Observable, AsyncSubject } from 'rxjs' import { Observable, AsyncSubject } from 'rxjs'
import { Injectable, Inject } from '@angular/core' import { Injectable, Inject } from '@angular/core'
import { AppService, Logger, LogService, ConfigService } from 'terminus-core' import { AppService, Logger, LogService, ConfigService, SplitTabComponent } from 'terminus-core'
import { IShell, ShellProvider, SessionOptions } from '../api' import { IShell, ShellProvider, SessionOptions } from '../api'
import { TerminalTabComponent } from '../components/terminalTab.component' import { TerminalTabComponent } from '../components/terminalTab.component'
import { UACService } from './uac.service' import { UACService } from './uac.service'
@ -58,6 +58,13 @@ export class TerminalService {
if (this.app.activeTab instanceof TerminalTabComponent && this.app.activeTab.session) { if (this.app.activeTab instanceof TerminalTabComponent && this.app.activeTab.session) {
cwd = await this.app.activeTab.session.getWorkingDirectory() cwd = await this.app.activeTab.session.getWorkingDirectory()
} }
if (this.app.activeTab instanceof SplitTabComponent) {
let focusedTab = this.app.activeTab.getFocusedTab()
if (focusedTab instanceof TerminalTabComponent && focusedTab.session) {
cwd = await focusedTab.session.getWorkingDirectory()
}
}
cwd = cwd || this.config.store.terminal.workingDirectory cwd = cwd || this.config.store.terminal.workingDirectory
cwd = cwd || null cwd = cwd || null
} }