# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1430492835 -3600
# Node ID 902f22e182f637574520d020807ddb4bfd9b6c6a
# Parent  3444a772d19e7f12bf9025ca6c10736f171de82f
Fixed Bug 1204: Multiple clicks creates multiple instances.

diff -r 3444a772d19e -r 902f22e182f6 ape.js
--- a/ape.js	Fri May 01 15:52:13 2015 +0100
+++ b/ape.js	Fri May 01 16:07:15 2015 +0100
@@ -401,14 +401,11 @@
 		audioEngineContext.selectedTrack = function(id) {
 			for (var i=0; i<this.audioObjects.length; i++)
 			{
-				if (id == i) {
-					this.audioObjects[i].outputGain.gain.value = 1.0;
-					this.audioObjects[i].play(audioContext.currentTime+0.01);
-				} else {
-					this.audioObjects[i].outputGain.gain.value = 0.0;
-					this.audioObjects[i].stop();
-				}
+				this.audioObjects[i].outputGain.gain.value = 0.0;
+				this.audioObjects[i].stop();
 			}
+			this.audioObjects[id].outputGain.gain.value = 1.0;
+			this.audioObjects[id].play(audioContext.currentTime+0.01);
 		};
 	}
 	
diff -r 3444a772d19e -r 902f22e182f6 core.js
--- a/core.js	Fri May 01 15:52:13 2015 +0100
+++ b/core.js	Fri May 01 16:07:15 2015 +0100
@@ -170,8 +170,11 @@
 	};
 	
 	this.stop = function() {
-		this.bufferNode.stop(0);
-		this.bufferNode = undefined;
+		if (this.bufferNode != undefined)
+		{
+			this.bufferNode.stop(0);
+			this.bufferNode = undefined;
+		}
 	};
 
 	this.constructTrack = function(url) {
diff -r 3444a772d19e -r 902f22e182f6 example_eval/project.xml
--- a/example_eval/project.xml	Fri May 01 15:52:13 2015 +0100
+++ b/example_eval/project.xml	Fri May 01 16:07:15 2015 +0100
@@ -18,7 +18,7 @@
 			<metricEnable>elementFlagMoved</metricEnable>
 		</Metric>
 	</setup>
-	<audioHolder id='0' hostURL="example_eval/" sampleRate="44100" randomiseOrder='true' repeatCount='1' loop='true' elementComments='true'>
+	<audioHolder id='0' hostURL="example_eval/" sampleRate="44100" randomiseOrder='true' repeatCount='1' loop='false' elementComments='true'>
 		<interface>
 			<title>Example Test Question</title>
 			<scale position="0">Min</scale>