kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/20.12'

Browse source
This commit is contained in:
David Faure 2020-12-15 18:48:11 +01:00
parent 20370b4c9f da636bf513
commit 42cd439af8
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/panels/places/placesitemlistwidget.cpp
View file

@ -57,8 +57,8 @@ void PlacesItemListWidget::updateCapacityBar()
}
const QUrl url = data().value("url").toUrl();
if (m_freeSpaceInfo.job || !m_freeSpaceInfo.lastUpdated.hasExpired()) {
// Job running or cache is still valid.
if (url.isEmpty() || m_freeSpaceInfo.job || !m_freeSpaceInfo.lastUpdated.hasExpired()) {
// No url, job running or cache is still valid.
return;
}

3
src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
View file

@ -290,6 +290,9 @@ bool cmdInstall(const QString &archive, QString &errorText)
if (archive.endsWith(QLatin1String(".desktop"))) {
// Append basename to destination directory
const auto dest = QDir(serviceDir).absoluteFilePath(QFileInfo(archive).fileName());
if (QFileInfo::exists(dest)) {
QFile::remove(dest);
}
qInfo() << "Single-File Service-Menu" << archive << dest;
QFile source(archive);