From 8171f4d8187109093a32322377a35676813546ea Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Mon, 2 Aug 2010 10:11:47 -0500
Subject: [PATCH] Catch exceptions in cursor detection.

If cursor Data URI scheme detection threw an exception, it would cause
canvas initialization to fail. cursor detection exceptions should just
disable local cursor change support, not cause canvas init to fail.
---
 include/canvas.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/include/canvas.js b/include/canvas.js
index 682055c4..b0f7b644 100644
--- a/include/canvas.js
+++ b/include/canvas.js
@@ -194,15 +194,20 @@ init: function (id) {
     for (i=0; i < 8 * 8 * 4; i++) {
         curDat.push(255);
     }
-    curSave = c.style.cursor;
-    Canvas.changeCursor(curDat, curDat, 2, 2, 8, 8);
-    if (c.style.cursor) {
-        Util.Info("Data URI scheme cursor supported");
-    } else {
-        Canvas.cursor_uri = false;
-        Util.Warn("Data URI scheme cursor not supported");
+    try {
+        curSave = c.style.cursor;
+        Canvas.changeCursor(curDat, curDat, 2, 2, 8, 8);
+        if (c.style.cursor) {
+            Util.Info("Data URI scheme cursor supported");
+        } else {
+            Canvas.cursor_uri = false;
+            Util.Warn("Data URI scheme cursor not supported");
+        }
+        c.style.cursor = curSave;
+    } catch (exc2) {
+        Util.Error("Data URI scheme cursor test exception: " + exc2);
+        conf.cursor_uri = false;
     }
-    c.style.cursor = curSave;
 
     Canvas.colourMap = [];
     Canvas.prevStyle = "";