[Pkg-mozext-commits] [tabmixplus] 08/30: Don't collect our session manager data when the manager disabled

[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 54769df5fedf0b0484f4ef1cc1a0641351609925
Author: onemen <tabmix.onemen at gmail.com>
Date:   Tue Mar 31 11:16:13 2015 +0300

    Don't collect our session manager data when the manager disabled
---
 chrome/content/session/session.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index 675c6a0..ca788cd 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -470,7 +470,8 @@ var TabmixSessionManager = { // jshint ignore:line
       // in closed window list.
       // in the last window if the user pref in not to save we delete the closed window list.
       var resultData = {canClose: true, showMorePrompt: true, saveSession: true, removeClosedTabs: false};
-      if (this.windowClosed || this.isPrivateSession)
+      if (this.windowClosed || this.isPrivateSession ||
+          (!this.enableManager && !this.enableBackup))
          return resultData;
 
       // we set aPopUp only in canQuitApplication
@@ -630,9 +631,11 @@ var TabmixSessionManager = { // jshint ignore:line
         4. return: true if its ok to close
                    false if user cancel quit
       */
-      this.saveAllWindows(this.gSessionPath[0], "windowclosed", true);
+      let enabled = this.enableManager || this.enableBackup;
+      if (enabled)
+         this.saveAllWindows(this.gSessionPath[0], "windowclosed", true);
       // cheack if all open windows are popup
-      var allPopups = !window.toolbar.visible;
+      var allPopups = enabled && !window.toolbar.visible;
       var wnd, enumerator;
       enumerator = Tabmix.windowEnumerator();
       while ( allPopups && enumerator.hasMoreElements() ) {

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