Fix possible crash when opening Dolphin with an enabled Terminal. Thanks to Dario...

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 8ee46d7a4f59a3e3dd05aea97a54daf67b204c48..7dbedd17d07bdbbd6ca4c1af9a69ae15c9b4e3de 100644 (file)
--- 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_terminalWidget = part->widget();
             m_layout->addWidget(m_terminalWidget);
             m_terminal = qobject_cast<TerminalInterfaceV2 *>(part);

-            m_terminal->showShellInDir(url().path());
-

         }        
     }
     if (m_terminal != 0) {
         }        
     }
     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();
         m_terminal->sendInput("cd " + KShell::quoteArg(url().path()) + '\n');
         m_terminal->sendInput("clear\n");
         m_terminalWidget->setFocus();