[Pkg-mozext-commits] [tabmixplus] 21/123: Don't overwrite tabs with 'inrestore' attribute when useer join multiple windows into one

[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 334d1f72bb602a3a4e279d3601d77234fea729a8
Author: onemen <tabmix.onemen at gmail.com>
Date:   Thu Aug 21 11:20:24 2014 +0300

    Don't overwrite tabs with 'inrestore' attribute when useer join multiple windows into one
---
 chrome/content/session/session.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index d35eb27..c098b93 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -3094,8 +3094,7 @@ try{
               delete aTab.loadOnStartup;
             }
             else if (caller == "firstwindowopen" || // overwrite all tabs that are not from apps on first window
-                 gBrowser.isBlankTab(aTab) && (aTab.hasAttribute("tabmix_busy") || !aTab.hasAttribute("busy"))) {
-               aTab.removeAttribute("tabmix_busy");
+                 gBrowser.isBlankTab(aTab) && (!aTab.hasAttribute("inrestore") && !aTab.hasAttribute("busy"))) {
                this.resetTab(aTab);
                blankTabs.push(aTab);
             }

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