Perform file conflict check earlier so that it also triggers when not saving

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Author: juliusknorr

lib/Service/DocumentService.php

@@ -293,6 +293,13 @@ public function autosave($file, $documentId, $version, $autoaveDocument, $force
 		$savedEtag = $file->getEtag();
 		$lastMTime = $document->getLastSavedVersionTime();
 
+		if ($lastMTime > 0 && $savedEtag !== $document->getLastSavedVersionEtag() && $force === false) {
+			if (!$this->cache->get('document-save-lock-' . $documentId)) {
+				throw new DocumentSaveConflictException('File changed in the meantime from outside');
+			}
+			return $document;
+		}
+
 		if ($autoaveDocument === null) {
 			return $document;
 		}
@@ -305,13 +312,6 @@ public function autosave($file, $documentId, $version, $autoaveDocument, $force
 		if ($file->getMTime() === $lastMTime && $lastMTime > time() - self::AUTOSAVE_MINIMUM_DELAY && $manualSave === false) {
 			return $document;
 		}
-		if ($lastMTime > 0 && $savedEtag !== $document->getLastSavedVersionEtag() && $force === false) {
-			if (!$this->cache->get('document-save-lock-' . $documentId)) {
-				throw new DocumentSaveConflictException('File changed in the meantime from outside');
-			} else {
-				return $document;
-			}
-		}
 		$this->cache->set('document-save-lock-' . $documentId, true, 10);
 		try {
 			$file->putContent($autoaveDocument);