From a4ab84eed395d62a5b32be56c563282c167da16b Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 23 Nov 2016 00:41:22 -0500
Subject: [PATCH] Avoid CustomizableUI errors in test output

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

diff --git a/chrome/content/zotero/icon.js b/chrome/content/zotero/icon.js
index c05cae6fee..09d311d1a0 100644
--- a/chrome/content/zotero/icon.js
+++ b/chrome/content/zotero/icon.js
@@ -35,7 +35,8 @@ var comboButtonsID = 'zotero-toolbar-buttons';
 addIcon();
 
 function addIcon() {
-	if (Zotero.toolbarIconAdded) {
+	// Don't try to add icons more than once, and avoid warnings in tests
+	if (Zotero.toolbarIconAdded || CustomizableUI.getPlacementOfWidget(comboButtonsID)) {
 		return;
 	}