www

commit 47c4f686e861003ffdf04b9cdef3c6e7925b79cd
parent 4bb7f7d08be8a29dd921f9a1d0d88c5d4a6ff4b1
Author: Simon Kornblith <simon@simonster.com>
Date:   Thu,  3 May 2012 15:40:53 -0400

Fix some issues with corrupted field codes

Diffstat:
M
chrome/content/zotero/xpcom/integration.js
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -1323,9 +1323,13 @@ Zotero.Integration.Fields.prototype._showCorruptFieldError = function(e, field, 
 		// Display reselect edit citation dialog
 		var me = this;
 		var oldWindow = Zotero.Integration.currentWindow;
+		var oldProgressCallback = me.progressCallback;
 		this.addEditCitation(field, function() {
-			Zotero.Integration.currentWindow.close();
+			if(Zotero.Integration.currentWindow && !Zotero.Integration.currentWindow.closed) {
+				Zotero.Integration.currentWindow.close();
+			}
 			Zotero.Integration.currentWindow = oldWindow;
+			me.progressCallback = oldProgressCallback;
 			me.updateSession(callback, errorCallback);
 		});
 		return false;