Connect to the currentDirectoryChanged signal after the shell setup

This fixes the problem that the view URL may be reset to the Home URL
when opening the Terminal Panel while browsing a remote URL. Moreover,
it fixes crashes that can occur when the signal is received during the
shell setup if the DolphinMainWindow does not have a valid
m_activeViewContainer yet.

BUG: 339502
BUG: 340233
REVIEW: 120726
FIXED-IN: 4.14.3
This commit is contained in:
Frank Reininghaus 2014-10-23 23:17:43 +02:00
parent a58f159854
commit 9d6f50ac50

View file

@ -116,11 +116,11 @@ void TerminalPanel::showEvent(QShowEvent* event)
}
}
if (m_terminal) {
connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
m_terminal->showShellInDir(url().toLocalFile());
changeDir(url());
m_terminalWidget->setFocus();
connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
}
Panel::showEvent(event);