From 6f71c5ab949b1053775cea4b255863c0f07f54ee Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Sun, 2 May 2010 01:44:30 +0000
Subject: [PATCH] =?UTF-8?q?TMupdateSettings=E3=81=AE=E4=B8=8A=E6=9B=B8?=
 =?UTF-8?q?=E3=81=8D=E7=94=A8=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E3=80=81?=
 =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E6=99=82=E3=81=AF=E8=B5=B0=E3=82=89?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@6643 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/hacks.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/content/treestyletab/hacks.js b/content/treestyletab/hacks.js
index fce3a576..96adff22 100644
--- a/content/treestyletab/hacks.js
+++ b/content/treestyletab/hacks.js
@@ -330,15 +330,17 @@ TreeStyleTabService.overrideExtensionsOnInitAfter = function TSTService_override
 	// Tab Mix Plus
 	if (this.getTreePref('compatibility.TMP') &&
 		'TMupdateSettings' in window) {
-		eval('window.TMupdateSettings = '+
-			window.TMupdateSettings.toSource().replace(
-				/(\{aTab.removeAttribute\("tabxleft"\);\})(\})/,
-				<![CDATA[$1
-					gBrowser.treeStyleTab.initTabAttributes(aTab);
-					gBrowser.treeStyleTab.initTabContentsOrder(aTab);
-				$2]]>
-			)
-		);
+		if (window.TMupdateSettings.toSource().indexOf('treeStyleTab') < 0) {
+			eval('window.TMupdateSettings = '+
+				window.TMupdateSettings.toSource().replace(
+					/(\{aTab.removeAttribute\("tabxleft"\);\})(\})/,
+					<![CDATA[$1
+						gBrowser.treeStyleTab.initTabAttributes(aTab);
+						gBrowser.treeStyleTab.initTabContentsOrder(aTab);
+					$2]]>
+				)
+			);
+		}
 
 		eval('window.TMP_contentAreaClick = '+
 			window.TMP_contentAreaClick.toSource().replace(