From 17c5631d8ead18058ccdd972a1e2ec2aaea9d97b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Tue, 21 Aug 2012 15:29:46 -0700
Subject: [PATCH] Bug 784511 - ContentStart event never fires because
 reportCrash() throws an exception [r=hub]

---
 b2g/chrome/content/shell.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index 4306a780e80f..d01f9f92e990 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -64,8 +64,11 @@ var shell = {
   },
 
   reportCrash: function shell_reportCrash() {
-    let crashID = Cc["@mozilla.org/xre/app-info;1"]
-      .getService(Ci.nsIXULRuntime).lastRunCrashID;
+    let crashID;
+    try {
+      crashID = Cc["@mozilla.org/xre/app-info;1"]
+                .getService(Ci.nsIXULRuntime).lastRunCrashID;
+    } catch(e) { }
     if (Services.prefs.getBoolPref('app.reportCrashes') &&
         crashID) {
       this.CrashSubmit().submit(crashID)