# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1492773655 -3600
# Node ID 4af2d531be4e7e208ff7cad8707da480d13de5fb
# Parent  c9912c7878ecc3545c0d9fa018babd19dd5a72c3# Parent  9d31ddedae2b5a9b51820d5d1857687e2ed08778
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r c9912c7878ec -r 4af2d531be4e js/core.js
--- a/js/core.js	Wed Apr 19 11:21:05 2017 +0100
+++ b/js/core.js	Fri Apr 21 12:20:55 2017 +0100
@@ -596,7 +596,7 @@
             } else {
                 jumpID = condition.jumpToOnFail;
             }
-            if (jumpID !== undefined) {
+            if (jumpID !== null) {
                 jumpToId.call(this, jumpID);
                 break;
             }
@@ -828,7 +828,7 @@
             }
             i++;
         }
-        processConditional.call(this, node, node.response);
+        processConditional.call(this, node, node.response.name);
         return true;
     }