From: Peter Penz <peter.penz19@gmail.com>
Date: Thu, 13 Aug 2009 19:12:49 +0000 (+0000)
Subject: Fix possible crash when opening Dolphin with an enabled Terminal. Thanks to Dario... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/54093338c413b578cff2377503940dbc2ab0238e

Fix possible crash when opening Dolphin with an enabled Terminal. Thanks to Dario Andres for the analyses!

BUG: 202953

svn path=/trunk/KDE/kdebase/apps/; revision=1011008
---

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index 8ee46d7a4..7dbedd17d 100644
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -90,11 +90,10 @@ void TerminalPanel::showEvent(QShowEvent* event)
             m_terminalWidget = part->widget();
             m_layout->addWidget(m_terminalWidget);
             m_terminal = qobject_cast<TerminalInterfaceV2 *>(part);
-            m_terminal->showShellInDir(url().path());
-
         }        
     }
     if (m_terminal != 0) {
+        m_terminal->showShellInDir(url().path());
         m_terminal->sendInput("cd " + KShell::quoteArg(url().path()) + '\n');
         m_terminal->sendInput("clear\n");
         m_terminalWidget->setFocus();