[Pkg-mozext-commits] [tabmixplus] 17/44: Calling TabmixSessionManager.canRestoreLastSession before we call initService trigger this.RDFService is null error

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 5e08bd5d5b33cd28471241a92e90eeadfc353167
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Oct 6 23:15:10 2014 +0300

    Calling TabmixSessionManager.canRestoreLastSession before we call initService trigger this.RDFService is null error
---
 chrome/content/session/session.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index 55659cf..a8c6781 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -302,6 +302,18 @@ var TabmixSessionManager = {
                              Tabmix.prefs.getBoolPref("undoClose");
       this._lastSaveTime = Date.now();
 
+      var sanitized = this.enableManager && TabmixSvc.sm.sanitized;
+      // check if we need to backup
+      if (Tabmix.firstWindowInSession && this.enableManager && !sanitized) {
+         try {
+           this.archiveSessions();
+         }
+         catch (ex) {Tabmix.assert(ex);}
+      }
+
+      if (!this.DATASource)
+         this.initService();
+
       let obs = Services.obs;
       obs.addObserver(this, "browser-window-change-state", true);
       obs.addObserver(this, "sessionstore-windows-restored", true);
@@ -319,15 +331,6 @@ var TabmixSessionManager = {
         obs.addObserver(this, "sessionstore-last-session-cleared", true);
       }
 
-      var sanitized = this.enableManager && TabmixSvc.sm.sanitized;
-      // check if we need to backup
-      if (Tabmix.firstWindowInSession && this.enableManager && !sanitized) {
-         try {
-           this.archiveSessions();
-         }
-         catch (ex) {Tabmix.assert(ex);}
-      }
-
       if (Tabmix.isVersion(200) && this.isPrivateWindow) {
          // disable saveing or changeing any data on the disk in private window
          document.getElementById("tmp_contextmenu_ThisWindow").setAttribute("disabled", true);
@@ -335,9 +338,6 @@ var TabmixSessionManager = {
          document.getElementById("tmp_disableSave").setAttribute("disabled", true);
       }
 
-      if (!this.DATASource)
-         this.initService();
-
       // If sessionStore restore the session after restart we do not need to do anything
       // when all tabs are pinned, session resore add the home page on restart
       // prepare history sessions

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git