www

commit 62a83e38ec59aaa6fdf4e00d80ffb6d2fbf5fee4
parent 097d2b54c9fc93e5b40567965503227d079099c6
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 12 Mar 2010 05:28:11 +0000

Don't prompt for master password on every startup (since 2.0.1)


Diffstat:
M
chrome/content/zotero/overlay.js
 | 
18
+++++++++++-------

1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
@@ -186,14 +186,18 @@ var ZoteroPane = new function()
 		// -- this way the page won't be displayed when they sync their DB to
 		// another profile or if the DB is initialized erroneously (e.g. while
 		// switching data directory locations)
-		else if (Zotero.Prefs.get('firstRun2')
-				&& (Zotero.Schema.dbInitialized || !Zotero.Sync.Server.enabled)) {
-			setTimeout(function () {
-				var url = "http://zotero.org/start";
-				gBrowser.selectedTab = gBrowser.addTab(url);
-			}, 400);
+		else if (Zotero.Prefs.get('firstRun2')) {
+			if (Zotero.Schema.dbInitialized || !Zotero.Sync.Server.enabled) {
+				setTimeout(function () {
+					var url = "http://zotero.org/start";
+					gBrowser.selectedTab = gBrowser.addTab(url);
+				}, 400);
+			}
 			Zotero.Prefs.set('firstRun2', false);
-			Zotero.Prefs.clear('firstRun');
+			try {
+				Zotero.Prefs.clear('firstRun');
+			}
+			catch (e) {}
 		}
 		
 		// Hide sync debugging menu by default