Merge branch 'Applications/19.08'

This commit is contained in:
Elvis Angelaccio 2019-07-28 18:31:46 +02:00
commit 572d4e54bb

View file

@ -177,7 +177,9 @@ void TerminalPanel::showEvent(QShowEvent* event)
}
if (m_terminal) {
m_terminal->showShellInDir(url().toLocalFile());
changeDir(url());
if(!hasProgramRunning()) {
changeDir(url());
}
m_terminalWidget->setFocus();
connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));