From 9b5b83117f4ba0617bc3cb77f03983f31ed70600 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 29 Aug 2014 14:25:05 -0700
Subject: [PATCH] CR

---
 examples/PlayRecordingOnAC.js      | 2 ++
 examples/Recorder.js               | 9 +++++----
 libraries/avatars/src/Recorder.cpp | 8 +++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/examples/PlayRecordingOnAC.js b/examples/PlayRecordingOnAC.js
index 9af5dd6f95..5a283a2557 100644
--- a/examples/PlayRecordingOnAC.js
+++ b/examples/PlayRecordingOnAC.js
@@ -19,6 +19,8 @@ Avatar.skeletonModelURL = "http://public.highfidelity.io/models/skeletons/Philip
 
 // Set position here if playFromCurrentLocation is true
 Avatar.position = { x:1, y: 1, z: 1 };
+Avatar.orientation = Quat.fromPitchYawRollDegrees(0, 0, 0);
+Avatar.scale = 1.0;
 
 Agent.isAvatar = true;
     
diff --git a/examples/Recorder.js b/examples/Recorder.js
index 12d72fae3b..7ecf0e2640 100644
--- a/examples/Recorder.js
+++ b/examples/Recorder.js
@@ -12,6 +12,8 @@
 Script.include("toolBars.js");
 
 var recordingFile = "recording.rec";
+var playFromCurrentLocation = true;
+var loop = true;
 
 var windowDimensions = Controller.getViewportDimensions();
 var TOOL_ICON_URL = "http://s3-us-west-1.amazonaws.com/highfidelity-public/images/tools/";
@@ -152,8 +154,8 @@ function mousePressEvent(event) {
 		if (MyAvatar.isPlaying()) {
 			MyAvatar.stopPlaying();
 		} else {
-			MyAvatar.setPlayFromCurrentLocation(true);
-			MyAvatar.setPlayerLoop(true);
+			MyAvatar.setPlayFromCurrentLocation(playFromCurrentLocation);
+			MyAvatar.setPlayerLoop(loop);
 	  	MyAvatar.startPlaying(true);
 	  }
   } else if (saveIcon === toolBar.clicked(clickedOverlay)) {
@@ -167,8 +169,7 @@ function mousePressEvent(event) {
   	if (!MyAvatar.isRecording()) {
   		recordingFile = Window.browse("Load recorcding from file", ".", "*.rec");
 	  	if (recordingFile != "null") {
-	  	} else {
-				MyAvatar.loadRecording(recordingFile);
+	  		MyAvatar.loadRecording(recordingFile);
   		}
   	}
   } else {
diff --git a/libraries/avatars/src/Recorder.cpp b/libraries/avatars/src/Recorder.cpp
index 15ac6ede6c..70568a3487 100644
--- a/libraries/avatars/src/Recorder.cpp
+++ b/libraries/avatars/src/Recorder.cpp
@@ -515,9 +515,6 @@ void writeRecordingToFile(RecordingPointer recording, QString filename) {
 RecordingPointer readRecordingFromFile(RecordingPointer recording, QString filename) {
     QElapsedTimer timer;
     timer.start();
-    if (!recording) {
-        recording.reset(new Recording());
-    }
     
     QByteArray byteArray;
     QUrl url(filename);
@@ -544,6 +541,11 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, QString filen
         byteArray = file.readAll();
         file.close();
     }
+    
+    if (!recording) {
+        recording.reset(new Recording());
+    }
+    
     QDataStream fileStream(byteArray);
     
     fileStream >> recording->_timestamps;