From 9920a845c635649eb09ed4348cfe2dc2e4389230 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 6 Aug 2017 17:50:05 +0200
Subject: [PATCH] Don't initialize storage requests until they start

---
 .../zotero/xpcom/storage/storageEngine.js     | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/chrome/content/zotero/xpcom/storage/storageEngine.js b/chrome/content/zotero/xpcom/storage/storageEngine.js
index 87a6ba38fa..a5df9c8fa3 100644
--- a/chrome/content/zotero/xpcom/storage/storageEngine.js
+++ b/chrome/content/zotero/xpcom/storage/storageEngine.js
@@ -293,17 +293,13 @@ Zotero.Sync.Storage.Engine.prototype.queueItem = Zotero.Promise.coroutine(functi
 		case Zotero.Sync.Storage.Local.SYNC_STATE_TO_DOWNLOAD:
 		case Zotero.Sync.Storage.Local.SYNC_STATE_FORCE_DOWNLOAD:
 			var type = 'download';
-			var onStart = Zotero.Promise.method(function (request) {
-				return this.controller.downloadFile(request);
-			}.bind(this));
+			var fn = 'downloadFile';
 			break;
 		
 		case Zotero.Sync.Storage.Local.SYNC_STATE_TO_UPLOAD:
 		case Zotero.Sync.Storage.Local.SYNC_STATE_FORCE_UPLOAD:
 			var type = 'upload';
-			var onStart = Zotero.Promise.method(function (request) {
-				return this.controller.uploadFile(request);
-			}.bind(this));
+			var fn = 'uploadFile';
 			break;
 		
 		case false:
@@ -314,18 +310,20 @@ Zotero.Sync.Storage.Engine.prototype.queueItem = Zotero.Promise.coroutine(functi
 			throw new Error("Invalid sync state " + item.attachmentSyncState);
 	}
 	
-	var request = new Zotero.Sync.Storage.Request({
-		type,
-		libraryID: this.libraryID,
-		name: item.libraryKey,
-		onStart,
-		onProgress: this.onProgress
-	});
 	if (type == 'upload') {
 		if (!(yield item.fileExists())) {
 			Zotero.debug("File " + item.libraryKey + " not yet available to upload -- skipping");
 			return;
 		}
 	}
-	this.queues[type].add(request.start.bind(request));
+	this.queues[type].add(() => {
+		var request = new Zotero.Sync.Storage.Request({
+			type,
+			libraryID: this.libraryID,
+			name: item.libraryKey,
+			onStart: request => this.controller[fn](request),
+			onProgress: this.onProgress
+		});
+		return request.start();
+	});
 })