mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Merge remote-tracking branch 'origin/release/20.12'
This commit is contained in:
commit
42cd439af8
|
@ -57,8 +57,8 @@ void PlacesItemListWidget::updateCapacityBar()
|
||||||
}
|
}
|
||||||
const QUrl url = data().value("url").toUrl();
|
const QUrl url = data().value("url").toUrl();
|
||||||
|
|
||||||
if (m_freeSpaceInfo.job || !m_freeSpaceInfo.lastUpdated.hasExpired()) {
|
if (url.isEmpty() || m_freeSpaceInfo.job || !m_freeSpaceInfo.lastUpdated.hasExpired()) {
|
||||||
// Job running or cache is still valid.
|
// No url, job running or cache is still valid.
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -290,6 +290,9 @@ bool cmdInstall(const QString &archive, QString &errorText)
|
||||||
if (archive.endsWith(QLatin1String(".desktop"))) {
|
if (archive.endsWith(QLatin1String(".desktop"))) {
|
||||||
// Append basename to destination directory
|
// Append basename to destination directory
|
||||||
const auto dest = QDir(serviceDir).absoluteFilePath(QFileInfo(archive).fileName());
|
const auto dest = QDir(serviceDir).absoluteFilePath(QFileInfo(archive).fileName());
|
||||||
|
if (QFileInfo::exists(dest)) {
|
||||||
|
QFile::remove(dest);
|
||||||
|
}
|
||||||
qInfo() << "Single-File Service-Menu" << archive << dest;
|
qInfo() << "Single-File Service-Menu" << archive << dest;
|
||||||
|
|
||||||
QFile source(archive);
|
QFile source(archive);
|
||||||
|
|
Loading…
Reference in a new issue