suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix race condition

Browse Source
This commit is contained in:
Simon Kornblith 2010-07-06 10:11:25 +00:00
parent 139036490c
commit 35c44b7470
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chrome/content/zotero/xpcom/zotero.js
View File

@ -463,10 +463,10 @@ var Zotero = new function(){
var dir = Components.classes["@mozilla.org/file/directory_service;1"] var dir = Components.classes["@mozilla.org/file/directory_service;1"]
.getService(Components.interfaces.nsIProperties) .getService(Components.interfaces.nsIProperties)
.get("CurProcD", Components.interfaces.nsILocalFile); .get("CurProcD", Components.interfaces.nsILocalFile);
Zotero.debug(dir.path);
return dir; return dir;
} else { } else {
if(this.isFx4) { if(this.isFx4) {
while(!Zotero.addon) Zotero.mainThread.processNextEvent(true);
var resourceURI = Zotero.addon.getResourceURI(); var resourceURI = Zotero.addon.getResourceURI();
return resourceURI.QueryInterface(Components.interfaces.nsIFileURL).file; return resourceURI.QueryInterface(Components.interfaces.nsIFileURL).file;
} else { } else {
@ -797,6 +797,7 @@ var Zotero = new function(){
*/ */
this.getInstalledExtensions = function () { this.getInstalledExtensions = function () {
if(this.isFx4) { if(this.isFx4) {
while(!Zotero.addons) Zotero.mainThread.processNextEvent(true);
var installed = Zotero.addons; var installed = Zotero.addons;
} else { } else {
var em = Components.classes["@mozilla.org/extensions/manager;1"]. var em = Components.classes["@mozilla.org/extensions/manager;1"].