From d3be78cbedce2d9990c1efe6abf304dde69ba19a Mon Sep 17 00:00:00 2001
From: Gubolin <gubolin@fantasymail.de>
Date: Sun, 17 Aug 2014 18:44:47 +0200
Subject: improve camera block error handling

---
 threads.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'threads.js')

diff --git a/threads.js b/threads.js
index 2d03fc7..eda8fc7 100644
--- a/threads.js
+++ b/threads.js
@@ -2778,6 +2778,11 @@ Process.prototype.doStreamCamera = function () {
         stage.trailsCanvas = newCanvas(stage.dimensions);
     }
 
+    error = function (msg) {
+       var err = { name: 'Camera', message: msg };
+       myself.handleError(err);
+    };
+
     stage.streamingCamera = false;
 
     if (video === null) {
@@ -2799,7 +2804,9 @@ Process.prototype.doStreamCamera = function () {
                 window.URL_ = window.URL || window.webkitURL;
                 video.src = window.URL_.createObjectURL(stream);
                 video.play();
-            }, this.handleError); // TODO: improve error handling
+            }, error);
+        } else {
+            error('getUserMedia not supported');
         }
         stage.lastCameraCanvas = newCanvas(stage.dimensions);
     } else {
-- 
cgit v1.3.1