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

2 files changed, 5 insertions, 2 deletions

diff --git a/src/panels/places/placesitemlistwidget.cpp b/src/panels/places/placesitemlistwidget.cpp
index 38bc13438..c9de3e6cf 100644
--- a/src/panels/places/placesitemlistwidget.cpp
+++ b/src/panels/places/placesitemlistwidget.cpp
@@ -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;
     }
 
diff --git a/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp b/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
index a8212831f..91da3d256 100644
--- a/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
+++ b/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
@@ -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);