Merge pull request #6028 from nextcloud/backport/6027/stable-3.10

[stable-3.10] Remove locketimeout condition.
nextcloud · Sep 6, 2023 · 1d8e64d · 1d8e64d
2 parents 4c9eabd + 8fefb60
commit 1d8e64d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/libsync/lockfilejobs.cpp b/src/libsync/lockfilejobs.cpp
@@ -165,10 +165,6 @@ SyncJournalFileRecord LockFileJob::handleReply()
         if (_lockTime <= 0) {
             return record;
         }
-
-        if (_lockTimeout <= 0) {
-            return record;
-        }
     }
 
     const auto relativePathInDb = path().mid(_remoteSyncPathWithTrailingSlash.size());