mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge branch 'release/22.04'
This commit is contained in:
commit
f08a8dd06b
|
@ -234,7 +234,9 @@ void TerminalPanel::changeDir(const QUrl& url)
|
||||||
|
|
||||||
void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHistory)
|
void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHistory)
|
||||||
{
|
{
|
||||||
if (dir == m_konsolePartCurrentDirectory) {
|
if (dir == m_konsolePartCurrentDirectory // We are already there
|
||||||
|
&& m_sendCdToTerminalHistory.isEmpty() // …and that is not because the terminal couldn't keep up
|
||||||
|
) {
|
||||||
m_clearTerminal = false;
|
m_clearTerminal = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -252,8 +254,6 @@ void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHist
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n');
|
|
||||||
|
|
||||||
// We want to ignore the currentDirectoryChanged(QString) signal, which we will receive after
|
// We want to ignore the currentDirectoryChanged(QString) signal, which we will receive after
|
||||||
// the directory change, because this directory change is not caused by a "cd" command that the
|
// the directory change, because this directory change is not caused by a "cd" command that the
|
||||||
// user entered in the panel. Therefore, we have to remember 'dir'. Note that it could also be
|
// user entered in the panel. Therefore, we have to remember 'dir'. Note that it could also be
|
||||||
|
@ -261,6 +261,8 @@ void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHist
|
||||||
if (addToHistory == HistoryPolicy::AddToHistory)
|
if (addToHistory == HistoryPolicy::AddToHistory)
|
||||||
m_sendCdToTerminalHistory.enqueue(QDir(dir).canonicalPath());
|
m_sendCdToTerminalHistory.enqueue(QDir(dir).canonicalPath());
|
||||||
|
|
||||||
|
m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n');
|
||||||
|
|
||||||
if (m_clearTerminal) {
|
if (m_clearTerminal) {
|
||||||
m_terminal->sendInput(QStringLiteral(" clear\n"));
|
m_terminal->sendInput(QStringLiteral(" clear\n"));
|
||||||
m_clearTerminal = false;
|
m_clearTerminal = false;
|
||||||
|
|
Loading…
Reference in a new issue