Bug 405172 Compose window does not close after cancelling account wizard r=Mnyromyr sr=mscott(!) a=Standard8
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Thu, 10 Sep 2009 20:33:22 +0100
changeset 3745 6dbd4ce05e2e6d9ca474a9119d298cfde9049dec
parent 3744 5323930e3e01c0101fd35546a3111f08eb22b651
child 3746 d7402d37bd3b69df3a12813159be2e3df34b215f
push id2936
push userneil@parkwaycc.co.uk
push dateThu, 10 Sep 2009 19:33:39 +0000
treeherdercomm-central@6dbd4ce05e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMnyromyr, mscott, Standard8
bugs405172
Bug 405172 Compose window does not close after cancelling account wizard r=Mnyromyr sr=mscott(!) a=Standard8
mail/components/compose/content/MsgComposeCommands.js
suite/mailnews/compose/MsgComposeCommands.js
--- a/mail/components/compose/content/MsgComposeCommands.js
+++ b/mail/components/compose/content/MsgComposeCommands.js
@@ -1640,18 +1640,18 @@ var gMsgEditorCreationObserver =
 
 function WizCallback(state)
 {
   if (state){
     ComposeStartup(false, null);
   }
   else
   {
-    MsgComposeCloseWindow(false); // Don't try to recycle a bogus window
-//  window.tryToClose=ComposeCanClose;
+    // The account wizard is still closing so we can't close just yet
+    setTimeout(MsgComposeCloseWindow, 0, false); // Don't recycle a bogus window
   }
 }
 
 function ComposeLoad()
 {
   try {
     var other_headers = getPref("mail.compose.other.header");
   }
--- a/suite/mailnews/compose/MsgComposeCommands.js
+++ b/suite/mailnews/compose/MsgComposeCommands.js
@@ -1443,18 +1443,18 @@ var gMsgEditorCreationObserver =
 
 function WizCallback(state)
 {
   if (state){
     ComposeStartup(false, null);
   }
   else
   {
-    MsgComposeCloseWindow(false); // Don't try to recycle a bogus window
-//  window.tryToClose=ComposeCanClose;
+    // The account wizard is still closing so we can't close just yet
+    setTimeout(MsgComposeCloseWindow, 0, false); // Don't recycle a bogus window
   }
 }
 
 function ComposeLoad()
 {
   // First get the preferences service
   try {
     var prefService = Components.classes["@mozilla.org/preferences-service;1"]