Bug 1081959 - "Something went wrong" isn't displayed when the call fails in the connection phase, r=dmose

2014-10-20 11:10:23 -07:00
parent 8ef54d04c5
commit 74201b4dc1
6 changed files with 50 additions and 10 deletions
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -400,9 +400,12 @@ loop.conversation = (function(mozL10n) {
        return;
      }

-      if (progressData.reason === "timeout" &&
-          (previousState === "init" || previousState === "alerting")) {
-        this._abortIncomingCall();
+      if (progressData.reason === "timeout") {
+        if (previousState === "init" || previousState === "alerting") {
+          this._abortIncomingCall();
+        } else {
+          this.setState({callFailed: true, callStatus: "end"});
+        }
      }
    },