]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Backport for #156586: don't try changing the directory within the terminal on non...
authorPeter Penz <peter.penz19@gmail.com>
Fri, 25 Jan 2008 18:28:50 +0000 (18:28 +0000)
committerPeter Penz <peter.penz19@gmail.com>
Fri, 25 Jan 2008 18:28:50 +0000 (18:28 +0000)
svn path=/branches/KDE/4.0/kdebase/apps/; revision=766395

src/terminalsidebarpage.cpp

index 4a82599f0c64d8c527c65be9dc99c6ac4fb581e8..4749e7714c49fbf9eb634d533c4628a3ba2d2ced 100644 (file)
@@ -50,11 +50,13 @@ QSize TerminalSidebarPage::sizeHint() const
 
 void TerminalSidebarPage::setUrl(const KUrl& url)
 {
 
 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');
     }
 }
 
     }
 }