┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2009-08-13 19:12:49 +0000
committerPeter Penz <[email protected]>2009-08-13 19:12:49 +0000
commit54093338c413b578cff2377503940dbc2ab0238e (patch)
tree2d977e7365ab12fe413683489b4260f8eb6d384d /src
parentc0922a81d88affaded8b8ff22b8671eedecf900c (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/panels/terminal/terminalpanel.cpp3
1 files changed, 1 insertions, 2 deletions
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();