Merge pull request #23 from schien/bug1277197-fix-js-error-in-ui-glue

Bug 1277197 - fix JS error in PresentationRequestUIGlue for 2-UAs device. r=kuoe0. a=jocheng
mozilla-b2g · Jun 1, 2016 · f50a49e · f50a49e
2 parents 1342028 + db22618
commit f50a49e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/b2g/components/PresentationRequestUIGlue.js b/b2g/components/PresentationRequestUIGlue.js
@@ -23,7 +23,11 @@ function PresentationRequestUIGlue() { }
 PresentationRequestUIGlue.prototype = {
 
   sendRequest: function(aUrl, aSessionId, aDevice) {
-    let localDevice = aDevice.QueryInterface(Ci.nsIPresentationLocalDevice);
+    let localDevice;
+    try {
+      localDevice = aDevice.QueryInterface(Ci.nsIPresentationLocalDevice);
+    } catch (e) {}
+
     if (localDevice) {
       return this.sendTo1UA(aUrl, aSessionId, localDevice.windowId);
     } else {