# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1517743005 0
# Node ID 171706465aa98699b94429cde32d1eb1530b33a1
# Parent  b89e760e091be4c545bd66b87f477854d0de8c0a# Parent  b3ebd07e7a0fb1d95049efcf0dfc40db7873450c
Merge branch 'master' into vnext

diff -r b89e760e091b -r 171706465aa9 js/core.js
--- a/js/core.js	Fri Jan 19 13:48:05 2018 +0000
+++ b/js/core.js	Sun Feb 04 11:16:45 2018 +0000
@@ -2437,8 +2437,11 @@
                 function trackCommentFocus() {
                     return document.activeElement.className.indexOf("trackComment") >= 0;
                 }
+                if (trackCommentFocus()) {
+                    return;
+                }
                 if (e.key === " ") {
-                    if (isPlaying() && trackCommentFocus() === false) {
+                    if (isPlaying()) {
                         e.preventDefault();
                         audioEngineContext.stop();
                     }