Issue 216 - First run page opens on every update

lib/filterStorage.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 348 matching lines @@
   /**
    * Loads all subscriptions from the disk
    * @param {nsIFile} [sourceFile] File to read from
    */
   loadFromDisk: function(sourceFile)
   {
     if (this._loading)
       return;
 
     TimeLine.enter("Entered FilterStorage.loadFromDisk()");
+    this._loading = true;
 
     let readFile = function(sourceFile, backupIndex)
     {
       TimeLine.enter("FilterStorage.loadFromDisk() -> readFile()");
 
       let parser = new INIParser();
       IO.readFromFile(sourceFile, true, parser, function(e)
       {
         TimeLine.enter("FilterStorage.loadFromDisk() read callback");
         if (!e && parser.subscriptions.length == 0)
@@ skipping 65 matching lines @@
 
       this._loading = false;
       FilterNotifier.triggerListeners("load");
 
       if (sourceFile != this.sourceFile)
         this.saveToDisk();
 
       TimeLine.leave("FilterStorage.loadFromDisk() read callback done");
     }.bind(this);
 
-    let startRead = function(file)
-    {
-      this._loading = true;
-      readFile(file, 0);
-    }.bind(this);
-
     let explicitFile;
     if (sourceFile)
     {
       explicitFile = true;
-      startRead(sourceFile);
+      readFile(sourceFile, 0);
     }
     else
     {
       explicitFile = false;
       sourceFile = FilterStorage.sourceFile;
 
       let callback = function(e, statData)
       {
         if (e || !statData.exists)
         {
           this.firstRun = true;
           this._loading = false;
           FilterNotifier.triggerListeners("load");
 
           TimeLine.leave("FilterStorage.loadFromDisk() read callback done");
         }
-        startRead(sourceFile);
+        readFile(sourceFile, 0);
       }
 
       if (sourceFile)
         IO.statFile(sourceFile, callback);
       else
         callback(true);
     }
 
     TimeLine.leave("FilterStorage.loadFromDisk() done");
   },
@@ skipping 397 matching lines @@
       Subscription.knownSubscriptions = origKnownSubscriptions;
     }
 
     // Allow events to be processed every now and then.
     // Note: IO.readFromFile() will deal with the potential reentrance here.
     this.linesProcessed++;
     if (this.linesProcessed % 1000 == 0)
       Utils.yield();
   }
 };