[Pkg-mozext-commits] [tabmixplus] 06/47: Don't call _sendRestoreCompletedNotifications from enableCrashRecovery. it call restoreWindowArguments before onFirstWindowPromptCallBack restore the session

[David Prévot]

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

taffit pushed a commit to branch upstream
in repository tabmixplus.

commit 0d1209fafdcd1a62b5f1f016f3d97aea4463cdeb
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Sep 17 21:17:08 2014 +0300

    Don't call _sendRestoreCompletedNotifications from enableCrashRecovery. it call restoreWindowArguments before onFirstWindowPromptCallBack restore the session
---
 chrome/content/session/session.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index e5e5bde..2c57db5 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -2233,8 +2233,9 @@ if (container == "error") { Tabmix.log("wrapContainer error path " + path + "\n"
                msg += "\n\n" + TabmixSvc.getSMString("sm.start.msg1");
             buttons = ["", TabmixSvc.setLabel("sm.button.continue")].join("\n");
             let callBack = function (aResult) {
-                             TabmixSessionManager.enableCrashRecovery(aResult);
-                           }
+               TabmixSessionManager.enableCrashRecovery(aResult);
+               TabmixSessionManager._sendRestoreCompletedNotifications(true);
+            }
             this.waitForCallBack = true;
             Tabmix.promptService([Tabmix.BUTTON_CANCEL, Tabmix.HIDE_MENUANDTEXT, chkBoxState],
                            [title, msg, "", chkBoxLabel, buttons], window, callBack);
@@ -2311,8 +2312,6 @@ try{
         this.prefBranch.setBoolPref("crashRecovery", true); // enable Crash Recovery
         Services.prefs.savePrefFile(null); // store the pref immediately
       }
-      if (this.waitForCallBack)
-        this._sendRestoreCompletedNotifications(true);
    },
 
    onFirstWindowPromptCallBack: function SM_onFirstWindowPromptCallBack(aResult) {

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