From c9d4ff431470974dd4cc5337e95cd77ce7f410fd Mon Sep 17 00:00:00 2001
From: Martynas Bagdonas <martbgd@gmail.com>
Date: Wed, 3 Nov 2021 11:08:22 +0200
Subject: [PATCH] Add additional error logging for PDF reader and note editor

---
 chrome/content/zotero/xpcom/editorInstance.js | 3 ++-
 chrome/content/zotero/xpcom/reader.js         | 3 ++-
 note-editor                                   | 2 +-
 pdf-reader                                    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/xpcom/editorInstance.js b/chrome/content/zotero/xpcom/editorInstance.js
index 8956de6f11..8a81597549 100644
--- a/chrome/content/zotero/xpcom/editorInstance.js
+++ b/chrome/content/zotero/xpcom/editorInstance.js
@@ -132,7 +132,7 @@ class EditorInstance {
 		this.saveSync();
 		await Zotero.Notes.unregisterEditorInstance(this);
 		if (!this._item.isAttachment()) {
-			Zotero.Notes.deleteUnusedEmbeddedImages(this._item);
+			await Zotero.Notes.deleteUnusedEmbeddedImages(this._item);
 		}
 	}
 
@@ -742,6 +742,7 @@ class EditorInstance {
 			}
 		}
 		catch (e) {
+			Zotero.logError(e);
 			if (message && ['update', 'importImages'].includes(message.action)) {
 				this._postMessage({ action: 'crash' });
 			}
diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js
index 30bd9a50be..017604521c 100644
--- a/chrome/content/zotero/xpcom/reader.js
+++ b/chrome/content/zotero/xpcom/reader.js
@@ -295,7 +295,7 @@ class ReaderInstance {
 				await Zotero.Attachments.createDirectoryForItem(item);
 			}
 			file.append(this.pdfStateFileName);
-			await OS.File.writeAtomic(file.path, JSON.stringify(state));
+			await Zotero.File.putContentsAsync(file.path, JSON.stringify(state));
 		}
 	}
 
@@ -648,6 +648,7 @@ class ReaderInstance {
 			}
 		}
 		catch (e) {
+			Zotero.logError(e);
 			let crash = message && ['setAnnotation'].includes(message.action);
 			this._postMessage({
 				action: crash ? 'crash' : 'error',
diff --git a/note-editor b/note-editor
index 8465a3abff..623c237081 160000
--- a/note-editor
+++ b/note-editor
@@ -1 +1 @@
-Subproject commit 8465a3abff643c6a1eea5288e625e5bc44aa1ab1
+Subproject commit 623c2370819a48988b91e7248c428bc0c28e7c0d
diff --git a/pdf-reader b/pdf-reader
index c939b9a572..a12714e8b6 160000
--- a/pdf-reader
+++ b/pdf-reader
@@ -1 +1 @@
-Subproject commit c939b9a572696f60a4334eadc2feefc155bdf7f8
+Subproject commit a12714e8b6e75daf9408193930c0774d2a3b94a1