Merge pull request #583 from kanaka/bug/misc-fixes

Misc Fixes (ImageData Constructor Detection and Firefox Nightly Bug Workaround)

2 files changed, 2 insertions, 9 deletions

diff --git a/include/display.js b/include/display.js
index 665fd3d..ade0451 100644
--- a/include/display.js
+++ b/include/display.js
@@ -17,7 +17,7 @@ var Display;
 
     var SUPPORTS_IMAGEDATA_CONSTRUCTOR = false;
     try {
-        new ImageData(new Uint8ClampedArray(1), 1, 1);
+        new ImageData(new Uint8ClampedArray(4), 1, 1);
         SUPPORTS_IMAGEDATA_CONSTRUCTOR = true;
     } catch (ex) {
         // ignore failure
diff --git a/include/rfb.js b/include/rfb.js
index d0e6c8f..694c14b 100644
--- a/include/rfb.js
+++ b/include/rfb.js
@@ -1165,14 +1165,7 @@ var RFB;
 
                 this._timing.last_fbu = (new Date()).getTime();
 
-                var handler = this._encHandlers[this._FBU.encoding];
-                try {
-                    //ret = this._encHandlers[this._FBU.encoding]();
-                    ret = handler();
-                } catch (ex)  {
-                    console.log("missed " + this._FBU.encoding + ": " + handler);
-                    ret = this._encHandlers[this._FBU.encoding]();
-                }
+                ret = this._encHandlers[this._FBU.encoding]();
 
                 now = (new Date()).getTime();
                 this._timing.cur_fbu += (now - this._timing.last_fbu);