Set the delayInjection flag before scriptDownloader is run so that it…

… can turn it off. This gets rid of the bug where you remove dependencies, and the delayInjection flag remains perpetually on. Closes greasemonkey#1165

content/config.js

@@ -345,13 +345,13 @@ Config.prototype = {
   },
 
   updateModifiedScripts: function(safeWin, chromeWin) {
-    // Find any updated scripts
+    // Find any updated scripts or scripts with delayed injection
     var scripts = this.getMatchingScripts(
-        function (script) { return script.isModified(); });
+        function (script) { return script.delayInjection || script.isModified(); });
     if (0 == scripts.length) return;
 
     for (var i = 0, script; script = scripts[i]; i++) {
-      if (!script.pendingExec) {
+      if (!script.delayInjection) {
         var parsedScript = this.parse(
             script.textContent, script._downloadURL, true);
         script.updateFromNewScript(parsedScript, safeWin, chromeWin);

content/script.js

@@ -318,13 +318,14 @@ Script.prototype = {
       this.pendingExec = [];
       this.pendingExec.push({'safeWin': safeWin, 'chromeWin': chromeWin});
 
+      // This flag needs to be set now so the scriptDownloader can turn it off
+      this.delayInjection = true;
+
       // Redownload dependencies.
       var scriptDownloader = new GM_ScriptDownloader(null, null, null);
       scriptDownloader.script = this;
       scriptDownloader.updateScript = true;
       scriptDownloader.fetchDependencies();
-
-      this.delayInjection = true;
     }
   },