diff options
| author | Peter Penz <[email protected]> | 2008-01-25 18:28:50 +0000 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2008-01-25 18:28:50 +0000 |
| commit | 2209fd6d98f7ecd40c093030c40c22491f2a9383 (patch) | |
| tree | 81917c6a8f2483531bdee2628e47813a2d15b8fd /src | |
| parent | 03bf5aa54372024eee5758ced0fb9abe7a058b9f (diff) | |
Backport for #156586: don't try changing the directory within the terminal on non-local URLs
svn path=/branches/KDE/4.0/kdebase/apps/; revision=766395
Diffstat (limited to 'src')
| -rw-r--r-- | src/terminalsidebarpage.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp index 4a82599f0..4749e7714 100644 --- a/src/terminalsidebarpage.cpp +++ b/src/terminalsidebarpage.cpp @@ -50,11 +50,13 @@ QSize TerminalSidebarPage::sizeHint() const void TerminalSidebarPage::setUrl(const KUrl& url) { - if (!SidebarPage::url().equals(url, KUrl::CompareWithoutTrailingSlash)) { - SidebarPage::setUrl(url); - if ((m_terminal != 0) && isVisible()) { - m_terminal->sendInput("cd " + KShell::quoteArg(url.path()) + '\n'); - } + if (!url.isValid() || (url == SidebarPage::url())) { + return; + } + + SidebarPage::setUrl(url); + if ((m_terminal != 0) && isVisible() && url.isLocalFile()) { + m_terminal->sendInput("cd " + KShell::quoteArg(url.path()) + '\n'); } } |
