Merge pull request #5497 from nextcloud/fix/node-written-exception

fix: catch expected exception in event handler

lib/Listeners/BeforeNodeWrittenListener.php

@@ -25,6 +25,7 @@
 
 namespace OCA\Text\Listeners;
 
+use OCA\Text\Exception\DocumentHasUnsavedChangesException;
 use OCA\Text\Service\DocumentService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
@@ -49,7 +50,11 @@ public function handle(Event $event): void {
 		if ($node instanceof File && $node->getMimeType() === 'text/markdown') {
 			if (!$this->documentService->isSaveFromText()) {
 				// Reset document session to avoid manual conflict resolution if there's no unsaved steps
-				$this->documentService->resetDocument($node->getId());
+				try {
+					$this->documentService->resetDocument($node->getId());
+				} catch (DocumentHasUnsavedChangesException) {
+					// Do not throw during event handling in this is expected to happen
+				}
 			}
 		}
 	}