Fixes greasemonkey#1165

Push window vars to the window list before scriptDownloader.fetchDependencies is called.
qufighter · Jul 12, 2010 · 3f38945 · 3f38945
1 parent 54933c8
commit 3f38945
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/content/script.js b/content/script.js
@@ -24,7 +24,7 @@ function Script(configNode) {
   this._dependFail = false
   this.delayInjection = false;
   this._rawMeta = null;
-  this.wins = [];
+  this.wins = null;
 
   if (configNode) this._loadFromConfigNode(configNode);
 }
@@ -314,16 +314,16 @@ Script.prototype = {
         if (!nextFile.equals(this.file)) nextFile.remove(true);
       }
 
+      // Store window references for late injection
+      this.wins = [];
+      this.wins.push({'safeWin': safeWin, 'chromeWin': chromeWin});
+
       // Redownload dependencies.
       var scriptDownloader = new GM_ScriptDownloader(null, null, null);
       scriptDownloader.script = this;
       scriptDownloader.updateScript = true;
       scriptDownloader.fetchDependencies();
 
-      // Store window references for late injection
-      this.wins = [];
-      this.wins.push({'safeWin': safeWin, 'chromeWin': chromeWin});
-
       this.delayInjection = true;
     }
   },

diff --git a/content/scriptdownloader.js b/content/scriptdownloader.js
@@ -210,7 +210,7 @@ GM_ScriptDownloader.prototype.finishInstall = function() {
     for (var i = 0, len = wins.length; i < len; ++i) {
       GM_getConfig().injectScript(this.script, wins[i]);
     }
-    this.script.wins = [];
+    this.script.wins = null;
 
     // Save new values to config.xml
     GM_getConfig()._save();