[or-cvs] r16242: Handle the reverse case where the session store doesn't have (torbutton/trunk/src/chrome/content)

[mikeperry at seul.org]

Author: mikeperry
Date: 2008-07-29 23:52:01 -0400 (Tue, 29 Jul 2008)
New Revision: 16242

Modified:
   torbutton/trunk/src/chrome/content/torbutton.js
Log:

Handle the reverse case where the session store doesn't have
anythign to restore, but we did not shut down normally.



Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2008-07-30 02:26:04 UTC (rev 16241)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2008-07-30 03:52:01 UTC (rev 16242)
@@ -2087,7 +2087,13 @@
             if(m_tb_prefs.getBoolPref("extensions.torbutton.normal_exit")) {
                 m_tb_prefs.setBoolPref("extensions.torbutton.normal_exit", false);
             } else {
-                torbutton_log(4, "Conflict between noncrashed and normal_exit states?");
+                // This happens if user decline to restore sessions after crashes
+                torbutton_log(4, "Conflict between noncrashed and normal_exit states.. Assuming crash but no session restore..");
+                m_tb_prefs.setBoolPref("extensions.torbutton.noncrashed", false);
+
+                // This will cause torbutton_crash_recover to get called:
+                m_tb_prefs.setBoolPref("extensions.torbutton.crashed", true);
+                return;
             }
         } catch(e) {
             torbutton_log(4, "Exception on noncrashed check: "+e);