Issue 6108 - No filter list is selected after a migration failure

adblockplus/Api.jsm

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 39 matching lines @@
 const USER_REMOVED_EXCEPTIONS_SUB_PREF = "user_removed_exception_subscription";
 
 function initFilterListeners()
 {
   FilterNotifier.on("load", onFiltersLoad);
   FilterNotifier.on("save", onFiltersSave);
 }
 
 function onFiltersLoad()
 {
-  let {addonVersion} = require("info");
   let detectedSubscriptionFailure = !hasBlockSubscription() &&
     (!getBoolPref(SUBSCRIPTIONS_SAVED_PREF) || !getBoolPref(USER_REMOVED_BLOCK_SUBS_PREF) || FilterStorage.loadFromDiskFailed);
 
   // We will only try to recover the default subscription settings if the addonVersion hasn't changed,
   // otherwise it will be handled in firstRunActions(), inside ui.js
+  let {addonVersion} = require("info");
   if (Prefs.currentVersion == addonVersion && detectedSubscriptionFailure)
   {
     if (getBoolPref(USER_REMOVED_EXCEPTIONS_SUB_PREF))
     {
       UI.addSubscription(UI.currentWindow, Prefs.currentVersion);
     }
     else
     {
       UI.addSubscription(UI.currentWindow, "0.0");
     }
   }
   Messaging.sendRequest({ type: "Abb:OnFiltersLoad" });
 }
+
 function onFiltersSave()
 {
   if (hasBlockSubscription())
   {
     setBoolPref(SUBSCRIPTIONS_SAVED_PREF, true);
   }
   Messaging.sendRequest({ type: "Abb:OnFiltersSave" });
 }
 
 function getBoolPref(name)
@@ skipping 240 matching lines @@
           {
             this.whitelistSite(data["url"], data["whitelisted"]);
             return {"success": true};
           }
           break;
       }
       return {"success": false, "error": "malformed request"};
     }).bind(this), "AdblockPlus:Api");
   }
 };