From: alex-z <blackslayer4@gmail.com>
Date: Sun, 21 Apr 2024 22:36:02 +0000 (+0200)
Subject: Fix CI errors.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~7^2~43^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1a849e07c5d654e59868c7c270355ef387282d72;p=nextcloud-desktop.git

Fix CI errors.

Signed-off-by: alex-z <blackslayer4@gmail.com>
---

diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index eb0eef725..60840911b 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -404,10 +404,12 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, const Entries &ent
         }
     }
 
-    if (item->_status == SyncFileItem::FileNameInvalid) {
-        _dirItem->_isAnyInvalidCharChild = true;
-    } else if (item->_status == SyncFileItem::FileNameClash) {
-        _dirItem->_isAnyCaseClashChild = true;
+    if (_dirItem) {
+        if (item->_status == SyncFileItem::FileNameInvalid) {
+            _dirItem->_isAnyInvalidCharChild = true;
+        } else if (item->_status == SyncFileItem::FileNameClash) {
+            _dirItem->_isAnyCaseClashChild = true;
+        }
     }
 
     _childIgnored = true;
diff --git a/test/syncenginetestutils.cpp b/test/syncenginetestutils.cpp
index 5e097a34b..933814925 100644
--- a/test/syncenginetestutils.cpp
+++ b/test/syncenginetestutils.cpp
@@ -260,7 +260,7 @@ FileInfo *FileInfo::find(PathComponents pathComponents, const bool invalidateEta
 
 FileInfo FileInfo::findRecursive(PathComponents pathComponents, const bool invalidateEtags)
 {
-    auto result = find({pathComponents.takeFirst()});
+    auto result = find({pathComponents.takeFirst()}, invalidateEtags);
     if (!result) {
         return *result;
     }