From 547f1c29e356ed0b65f8f9880215aca9c1a40830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= <adomas.ven@gmail.com>
Date: Fri, 1 Jun 2018 23:26:13 +0300
Subject: [PATCH] Integration: Fix non-existent session errors preventing
 displayError from working

---
 chrome/content/zotero/xpcom/integration.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index 5ec2beec8..36b5e2f38 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -378,7 +378,8 @@ Zotero.Integration = new function() {
 		// We do not want to redisplay the progress bar if this window close
 		// was the final close of the integration command
 		await Zotero.Promise.delay(10);
-		if (Zotero.Integration.currentDoc) {
+		if (Zotero.Integration.currentDoc && Zotero.Integration.currentSession
+				&& Zotero.Integration.currentSession.progressBar) {
 			Zotero.Integration.currentSession.progressBar.show();
 		}
 	};