Use SessionStore.promiseInitialized() to avoid race condition in "about:home" (#774 )

* Use SessionStore.promiseInitialized() to avoid race condition in "about:home" * Improve code style of [d6c3adb91c9f29786f8ed8d93baa14c076494017]
Merge branch 'master' into Pale_Moon-release
2018-09-18 08:25:39 +02:00 · 2018-09-17 08:51:49 +02:00 · 2018-08-30 16:59:46 +02:00 · 2018-08-30 12:36:03 +02:00 · 2018-08-30 12:33:56 +02:00 · 2018-08-26 17:44:06 +02:00
2 changed files with 13 additions and 6 deletions
@@ -2421,11 +2421,18 @@ function BrowserOnAboutPageLoad(doc) {
  /* === about:home === */

  if (doc.documentURI.toLowerCase() == "about:home") {
-    let ss = Components.classes["@mozilla.org/browser/sessionstore;1"].
-             getService(Components.interfaces.nsISessionStore);
-    if (ss.canRestoreLastSession &&
-        !PrivateBrowsingUtils.isWindowPrivate(window))
-      doc.getElementById("launcher").setAttribute("session", "true");
+    if (!PrivateBrowsingUtils.isWindowPrivate(window)) {
+      let wrapper = {};
+      Cu.import("resource:///modules/sessionstore/SessionStore.jsm", wrapper);
+      let ss = wrapper.SessionStore;
+      ss.promiseInitialized.then(function() {
+        if (ss.canRestoreLastSession) {
+          doc.getElementById("launcher").setAttribute("session", "true");
+        }
+      }).then(null, function onError(x) {
+        Cu.reportError("Error in SessionStore init while processing 'about:home': " + x);
+      });
+    }

    // Inject search engine and snippets URL.
    let docElt = doc.documentElement;
@@ -1 +1 @@
-28.1.0a1
+28.1.0
Author	SHA1	Message	Date
JustOff	775e800ca0	Use SessionStore.promiseInitialized() to avoid race condition in "about:home" (#774 ) * Use SessionStore.promiseInitialized() to avoid race condition in "about:home" * Improve code style of [d6c3adb91c9f29786f8ed8d93baa14c076494017]	2018-09-18 08:25:39 +02:00
wolfbeast	882aaf5b1f	Merge branch 'master' into Pale_Moon-release # Conflicts: # application/palemoon/config/version.txt # js/src/jit/x86-shared/AssemblerBuffer-x86-shared.h # toolkit/components/search/orginal/nsSearchService.js	2018-09-17 08:51:49 +02:00
wolfbeast	8ee235ca5d	Version bump for minor bugfix release.	2018-08-30 16:59:46 +02:00
wolfbeast	cc54bbe952	Revert "Bug 1388020. r=nical, a=RyanVM" This reverts commit `e7189e33f5`.	2018-08-30 12:36:03 +02:00
wolfbeast	73b202b1e5	Revert "Bug 1444668 - Avoid allocating large AssemblerBuffers. r=luke, r=bbouvier, a=RyanVM" This reverts commit `9472136272`.	2018-08-30 12:33:56 +02:00
wolfbeast	21042963de	Version bump for win rebuild with less aggressive build config.	2018-08-26 17:44:06 +02:00
wolfbeast	d443656df5	Version bump for release builds.	2018-08-07 14:20:47 +02:00
Matt A. Tobin	29a8db7280	Fix include path	2018-08-06 18:02:27 +02:00
Matt A. Tobin	daa52eef9a	Add a slightly modified version of the gecko/44 search service and use it when building Pale Moon	2018-08-06 18:02:10 +02:00
Matt A. Tobin	95ce1f0d63	Move the "native" search service to a subdirectory	2018-08-06 18:01:49 +02:00
SpockMan02	4dadef2740	Restore some osx icons	2018-08-06 11:12:29 +02:00
SpockMan02	b5d8e6d28f	Revert osx editBookmarkOverlay.css to osx version	2018-08-06 11:12:16 +02:00
adeshkp	fc0477a98e	Fix constructor in nsHtml5AtomTable.cpp Follow up to `2bc00ef` to fix build bustage	2018-08-06 11:10:24 +02:00
adeshkp	36d06b9e75	Improve nsHtml5AtomTable performance (#693 ) * cpp change * h change	2018-08-06 11:10:10 +02:00
wolfbeast	51bdd3efbc	Make AC option for devtools (client) an enable_bool to align with the default.	2018-08-04 08:21:29 +02:00
janekptacijarabaci	bc2584493a	[PALEMOON] Bug 863773 - Changes the way plugin handlers are loaded at the preferences applications pane. Uses enabledPlugin attribute from each navigator.mimeTypes to find the actual plugin used to handle the mime type	2018-08-04 08:07:02 +02:00
janekptacijarabaci	0f38772573	[PALEMOON] Bug 1034043 - Fix remaining use of "awlaysAsk" attribute in applications pref pane	2018-08-04 08:06:49 +02:00
janekptacijarabaci	ef81277925	[PALEMOON] Bug 480242 - "Always ask" doesn't work for Plugins	2018-08-04 08:06:36 +02:00
janekptacijarabaci	8b20931e12	[PALEMOON] Bug 757726 - Populate Preferences' Applications list using PluginHost	2018-08-04 08:06:24 +02:00
SpockMan02	b247982d37	Restore Mac bookmark doorhanger styling	2018-08-04 08:05:34 +02:00
@@ -1 +1 @@
 .1.0a1
 .1.0