From 39bec9b1a2dba92250cadd3951cb36a66f075159 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 12 Feb 2012 19:04:04 -0500
Subject: [PATCH] Don't break X11

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

diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index 391df724e..03f6ac6e8 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -491,6 +491,7 @@ Zotero.Integration = new function() {
 				if(!_x11Display) {
 					Zotero.debug("Integration: Could not open display; not activating");
 					_x11 = false;
+					return;
 				}
 				
 				Zotero.addShutdownListener(function() {
@@ -501,10 +502,12 @@ Zotero.Integration = new function() {
 				if(!_x11RootWindow) {
 					Zotero.debug("Integration: Could not get root window; not activating");
 					_x11 = false;
+					return;
 				}
 			}
 	
 			win.addEventListener("load", function() {
+				var intervalID;
 				intervalID = win.setInterval(function() {
 					_X11BringToForeground(win, intervalID);
 				}, 50);