summaryrefslogtreecommitdiff
path: root/include/util.js
diff options
context:
space:
mode:
authorSolly <directxman12+github@gmail.com>2014-09-19 12:35:27 -0400
committerSolly <directxman12+github@gmail.com>2014-09-19 12:35:27 -0400
commite4e9a9b97fec107b25573b29d2e72a6abf8f0a46 (patch)
tree1b24a41748a1e1f97a3b61487c88ec6852efac34 /include/util.js
parent2c9623b5a73e5ab9b54d462596d1fef0063c9a73 (diff)
parent77bd04f8338b5ccaf78e2f8e3df0400ad9908ca9 (diff)
downloadnovnc-e4e9a9b97fec107b25573b29d2e72a6abf8f0a46.tar.gz
Merge pull request #391 from mandre/fix_invalid_property
Fix invalid updateState property on RFB preventing noVNC to load
Diffstat (limited to 'include/util.js')
-rw-r--r--include/util.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/util.js b/include/util.js
index c145d5a..a6045da 100644
--- a/include/util.js
+++ b/include/util.js
@@ -341,6 +341,10 @@ Util.set_defaults = function (obj, conf, defaults) {
for (i = 0; i < keys.length; i++) {
var setter = obj['_raw_set_' + keys[i]];
+ if (!setter) {
+ Util.Warn('Invalid property ' + keys[i]);
+ continue;
+ }
if (conf[keys[i]]) {
setter.call(obj, conf[keys[i]]);