Merge pull request #160 from clint-tseng/cxlt/159

ui/bug #159: NPE on accessing successor property value.
getodk · Jun 5, 2017 · 918b1f6 · 918b1f6
2 parents a471ca1 + 9a17eb0
commit 918b1f6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/public/javascripts/control.js b/public/javascripts/control.js
@@ -115,7 +115,7 @@
 
         // SPECIAL CASE:
         // update the followup question text from that value.
-        if ((properties.other != null) && (properties.other.value !== false))
+        if ((properties.other != null) && (properties.other.value != null) && (properties.other.value !== false))
             $info.find('.controlSuccessorCondition span').text(properties.other.value.join(' or '));
     };