┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElvis Angelaccio <[email protected]>2019-07-28 18:31:46 +0200
committerElvis Angelaccio <[email protected]>2019-07-28 18:31:46 +0200
commit572d4e54bbe68c35df7de1f54ea8f6f81db6a21c (patch)
tree6f218bcdfc38897386c66e036e0c2c82e6d3a0ad /src
parentdc586ada63d1822fbbe38a0dd3449c73b03928e0 (diff)
parent8bed4c25ee42056174519b45b899dddfce24a0e9 (diff)
Merge branch 'Applications/19.08'
Diffstat (limited to 'src')
-rw-r--r--src/panels/terminal/terminalpanel.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index 8dedd0be1..52d2a77df 100644
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -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)));