added waitForThread method. detach and join are incompatible so

have added a close parameter to stopThread that defaults to true
but is called as false from the thread to not called detach.
wait has also a stop parameter to set threadRunning to false and then
wait for the thread to finish or only wait in case the thread will
stop by itself. Closes openframeworks#204

addons/ofxThread/src/ofxThread.cpp

@@ -97,17 +97,43 @@ bool ofxThread::unlock(){
 } 
 
 //------------------------------------------------- 
-void ofxThread::stopThread(){ 
-   if(threadRunning){ 
-      #ifdef TARGET_WIN32 
-         CloseHandle(myThread); 
-      #else 
-         //pthread_mutex_destroy(&myMutex); 
-         pthread_detach(myThread); 
-      #endif 
-      if(verbose)printf("ofxThread: thread stopped\n"); 
-      threadRunning = false; 
-   }else{ 
-      if(verbose)printf("ofxThread: thread already stopped\n"); 
-   } 
+void ofxThread::stopThread(bool close){
+	if(threadRunning){
+		if(close){
+			#ifdef TARGET_WIN32
+				CloseHandle(myThread);
+			#else
+				//pthread_mutex_destroy(&myMutex);
+				pthread_detach(myThread);
+			#endif
+		}
+		if(verbose)printf("ofxThread: thread stopped\n");
+		threadRunning = false;
+	}else{
+		if(verbose)printf("ofxThread: thread already stopped\n");
+	}
+}
+
+//-------------------------------------------------
+void ofxThread::waitForThread(bool stop){
+	if (threadRunning){
+		// Reset the thread state
+		if(stop){
+			threadRunning = false;
+			if(verbose)printf("ofxThread: stopping thread\n");
+		}
+		if(verbose)printf("ofxThread: waiting for thread to stop\n");
+		// Wait for the thread to finish
+		#ifdef TARGET_WIN32
+			WaitForSingleObject(myThread, INFINITE);
+			CloseHandle(myThread);
+		#else
+			if(pthread_self()==myThread) printf("ofxThread: error, waitForThread should only be called from outside the thread");
+		    pthread_join(myThread, NULL);
+		#endif
+		if(verbose)printf("ofxThread: thread stopped\n");
+		myThread = NULL;
+   }else{
+		if(verbose)printf("ofxThread: thread already stopped\n");
+	}
 }

addons/ofxThread/src/ofxThread.h

@@ -7,7 +7,6 @@
 	#include <process.h>
 #else
     #include <pthread.h>
-    #include <semaphore.h>
 #endif
 
 class ofxThread{
@@ -19,7 +18,8 @@ class ofxThread{
 		void startThread(bool _blocking = true, bool _verbose = true);
 		bool lock();
 		bool unlock();
-		void stopThread();
+		void stopThread(bool close = true);
+		void waitForThread(bool stop = true);
 
 	protected:
 
@@ -35,15 +35,16 @@ class ofxThread{
 			static unsigned int __stdcall thread(void * objPtr){
 				ofxThread* me	= (ofxThread*)objPtr;
 				me->threadedFunction();
-				me->stopThread();
+				me->stopThread(false);
 				return 0;
 			}
 
 		#else
 			static void * thread(void * objPtr){
 				ofxThread* me	= (ofxThread*)objPtr;
 				me->threadedFunction();
-				me->stopThread();
+				me->stopThread(false);
+				pthread_exit(NULL);
 				return 0;
 			}
 		#endif