From eb3d93eecde12e2ebc40f410177d046344980f85 Mon Sep 17 00:00:00 2001
From: Hugues Bruyere <hugues@smallfly.com>
Date: Thu, 19 Jun 2014 15:25:05 -0400
Subject: [PATCH] Having the Eds::StartLiveView command sent in the thread was
 freezing the app (Tested w/ Canon SDK 2.14 and EOS Rebel T5i firmware 1.1.3).

---
 src/ofxEdsdk.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ofxEdsdk.cpp b/src/ofxEdsdk.cpp
index 96fc73b..cd72ad7 100644
--- a/src/ofxEdsdk.cpp
+++ b/src/ofxEdsdk.cpp
@@ -286,12 +286,12 @@ namespace ofxEdsdk {
 	}
 	
 	void Camera::resetLiveView() {
-		lock();
 		if(connected) {
 			Eds::StartLiveview(camera);
+            lock();
 			lastResetTime = ofGetElapsedTimef();
+            unlock();
 		}
-		unlock();
 	}
 	
 	void Camera::threadedFunction() {