From 971d1fdf8599dccdc604ed9374373af16af8354f Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Thu, 27 Oct 2005 14:08:28 +0000
Subject: *** empty log message ***

---
 src/camera.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/camera.cc')

diff --git a/src/camera.cc b/src/camera.cc
index 26a52a4..de017dc 100644
--- a/src/camera.cc
+++ b/src/camera.cc
@@ -83,11 +83,10 @@ Camera::~Camera()
   // Signal to the threads to stop
   running = 0;
 
-  /* // FIXME: Add some way to stop a thread object
-	pthread_join(decodetid, NULL);
-	pthread_join(playertid, NULL);
-  pthread_join(encodetid, NULL);
-  */
+  // Wait for the threads to stop
+  decoder->wait_stop();
+  encoder->wait_stop();
+  player->wait_stop();
 
 	delete decoder;
 	delete encoder;
-- 
cgit v1.2.3