Merge branch 'master' into kf6

2 files changed, 4 insertions, 4 deletions

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index 53464e620..9e0391c41 100644
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -54,12 +54,12 @@ void TerminalPanel::goHome()
     sendCdToTerminal(QDir::homePath(), HistoryPolicy::SkipHistory);
 }
 
-QString TerminalPanel::currentWorkingDirectory()
+bool TerminalPanel::currentWorkingDirectoryIsChildOf(const QString &path) const
 {
     if (m_terminal) {
-        return m_terminal->currentWorkingDirectory();
+        return m_terminal->currentWorkingDirectory().startsWith(path);
     }
-    return QString();
+    return false;
 }
 
 void TerminalPanel::terminalExited()
diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h
index a1b7af03a..8eee3c10f 100644
--- a/src/panels/terminal/terminalpanel.h
+++ b/src/panels/terminal/terminalpanel.h
@@ -45,7 +45,7 @@ public:
      *        home when an unmounting request is received.
      */
     void goHome();
-    QString currentWorkingDirectory();
+    bool currentWorkingDirectoryIsChildOf(const QString &path) const;
     bool isHiddenInVisibleWindow() const;
     bool terminalHasFocus() const;
     bool hasProgramRunning() const;