mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 16:31:21 +00:00
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:
parent
3b7e6afbf1
commit
62c7120acd
|
@ -116,11 +116,11 @@ void TerminalPanel::showEvent(QShowEvent* event)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (m_terminal) {
|
if (m_terminal) {
|
||||||
connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
|
|
||||||
this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
|
|
||||||
m_terminal->showShellInDir(url().toLocalFile());
|
m_terminal->showShellInDir(url().toLocalFile());
|
||||||
changeDir(url());
|
changeDir(url());
|
||||||
m_terminalWidget->setFocus();
|
m_terminalWidget->setFocus();
|
||||||
|
connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
|
||||||
|
this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel::showEvent(event);
|
Panel::showEvent(event);
|
||||||
|
|
Loading…
Reference in a new issue