Merge branch 'release/22.04'

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index ba1d1fc22200e120434abe16f8a8473b93252a54..c64895d2e94d6b4ad3a6e481785a022d0814b695 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -139,6 +139,7 @@ Keywords[pt]=ficheiros;gestão de ficheiros;navegação de ficheiros;samba;parti
 Keywords[pt_BR]=arquivo;gerenciamento de arquivos;navegação de arquivos;samba;compartilhamentos de rede;explorador;localizador;
 Keywords[ro]=fișiere;gestiune fișiere;răsfoire fișiere;samba;partajări de rețea;unități de rețea;Explorer;Finder;
 Keywords[ru]=files;file management;file browsing;samba;network shares;Explorer;Finder;файлы,управление файлами,просмотр файлов,сетевые папки
+Keywords[sk]=súbory;správa súborov;prehliadanie súborov;samba;sieťové akcie;Prieskumník;Vyhľadávač;
 Keywords[sl]=datoteke;upravljanje z datotekami;brskanje po datotekah;samba;mrežni diski;Raziskovalec;Iskalec;
 Keywords[sv]=filer;filhantering;filbläddring;samba;delade nätverksresurser;Utforskare;Finder;
 Keywords[tr]=dosyalar;dosya yönetimi;dosya göz at;samba;ağ paylaşımları;Explorer;Finder;

diff --git a/src/userfeedback/placesdatasource.cpp b/src/userfeedback/placesdatasource.cpp
index 6db89636d0862e208c1399d8b0dc0396b12a8a93..991ce0a18bba9e3f6807c9df560cec1af1c3fa7d 100644 (file)
--- a/src/userfeedback/placesdatasource.cpp
+++ b/src/userfeedback/placesdatasource.cpp
@@ -45,7 +45,7 @@ QVariant PlacesDataSource::data()
             auto storageAccess = device.as<Solid::StorageAccess>();
             if (storageAccess) {
                 auto mountPoint = KMountPoint::currentMountPoints().findByPath(storageAccess->filePath());
-                if (!mountPoint->mountedFrom().startsWith(QLatin1String("kdeconnect@"))) {
+                if (mountPoint && !mountPoint->mountedFrom().startsWith(QLatin1String("kdeconnect@"))) {
                     hasSSHFS = true;
                     continue;
                 }