From f1dc09d9d9816023cc1b6b3ef17d7bf78ab7bbbd Mon Sep 17 00:00:00 2001
From: Hsin-Yi Tsai <htsai@mozilla.com>
Date: Wed, 5 Mar 2014 20:19:38 +0800
Subject: [PATCH] Bug 979626 - Crash in Telephony while running stability
 scripts. r=vicamo

---
 dom/telephony/Telephony.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dom/telephony/Telephony.cpp b/dom/telephony/Telephony.cpp
index 8a4635d5fd7..0ce924d4e2d 100644
--- a/dom/telephony/Telephony.cpp
+++ b/dom/telephony/Telephony.cpp
@@ -202,12 +202,6 @@ Telephony::Create(nsPIDOMWindow* aOwner, ErrorResult& aRv)
     return nullptr;
   }
 
-  rv = ril->RegisterListener(telephony->mListener);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
-    return nullptr;
-  }
-
   return telephony.forget();
 }
 
@@ -635,6 +629,10 @@ Telephony::EnumerateCallStateComplete()
   if (NS_FAILED(NotifyCallsChanged(nullptr))) {
     NS_WARNING("Failed to notify calls changed!");
   }
+
+  if (NS_FAILED(mProvider->RegisterListener(mListener))) {
+    NS_WARNING("Failed to register listener!");
+  }
   return NS_OK;
 }