From 56138c585a6ea609fc5e61c64e93befa0a097c6a Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Fri, 20 Apr 2018 08:56:09 +0200
Subject: moebius#144: Launch command: basilisk "-migration -p" (throws an
 error)

https://github.com/MoonchildProductions/moebius/pull/144
---
 toolkit/components/xulstore/XULStore.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/xulstore/XULStore.js b/toolkit/components/xulstore/XULStore.js
index c2721327c..8b5bc1313 100644
--- a/toolkit/components/xulstore/XULStore.js
+++ b/toolkit/components/xulstore/XULStore.js
@@ -63,11 +63,21 @@ XULStore.prototype = {
   load: function () {
     Services.obs.addObserver(this, "profile-before-change", true);
 
-    this._storeFile = Services.dirsvc.get("ProfD", Ci.nsIFile);
+    let profileType = "ProfD";
+    try {
+      this._storeFile = Services.dirsvc.get(profileType, Ci.nsIFile);
+    } catch (ex) {
+      try {
+        profileType = "ProfDS";
+        this._storeFile = Services.dirsvc.get(profileType, Ci.nsIFile);
+      } catch (ex) {
+        throw new Error("Can't find profile directory.");
+      }
+    }
     this._storeFile.append(STOREDB_FILENAME);
 
     if (!this._storeFile.exists()) {
-      this.import();
+      this.import(profileType);
     } else {
       this.readFile();
     }
@@ -90,8 +100,8 @@ XULStore.prototype = {
     Services.console.logStringMessage("XULStore: " + message);
   },
 
-  import: function() {
-    let localStoreFile = Services.dirsvc.get("ProfD", Ci.nsIFile);
+  import(profileType) {
+    let localStoreFile = Services.dirsvc.get(profileType || "ProfD", Ci.nsIFile);
 
     localStoreFile.append("localstore.rdf");
     if (!localStoreFile.exists()) {
-- 
cgit v1.2.3