# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1488370849 0
# Node ID e52cdf24e817722bc55a90ef32850368f025b226
# Parent  1662f4df5de6ca6a47139b292693144909f699cf# Parent  7ebeb0bffc5a4688b03ad8bbe956b0658e4c0d81
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r 1662f4df5de6 -r e52cdf24e817 js/core.js
--- a/js/core.js	Wed Mar 01 10:22:02 2017 +0000
+++ b/js/core.js	Wed Mar 01 12:20:49 2017 +0000
@@ -1879,10 +1879,10 @@
             copybuffer.buffer = copybuffer.copyBuffer(preSilenceTime, postSilenceTime);
         }
 
-        copybuffer.lufs = callee.buffer.lufs;
+        copybuffer.buffer.lufs = callee.buffer.lufs;
         this.buffer = copybuffer;
 
-        var targetLUFS = this.specification.parent.loudness || specification.loudness;
+        var targetLUFS = this.specification.loudness || this.specification.parent.loudness || specification.loudness;
         if (typeof targetLUFS === "number" && isFinite(targetLUFS)) {
             this.buffer.buffer.playbackGain = decibelToLinear(targetLUFS - this.buffer.buffer.lufs);
         } else {