don't wait on terminated thread

havlenapetr · havlenapetr · commit 67935bc839b4 · 2010-08-03T19:26:13.000+02:00
diff --git a/jni/libmediaplayer/decoder.cpp b/jni/libmediaplayer/decoder.cpp
@@ -35,7 +35,7 @@ void IDecoder::stop()
     __android_log_print(ANDROID_LOG_INFO, TAG, "waiting on end of decoder thread");
     int ret = -1;
     if((ret = wait()) != 0) {
-        __android_log_print(ANDROID_LOG_ERROR, TAG, "Couldn't cancel audio IDecoder: %i", ret);
+        __android_log_print(ANDROID_LOG_ERROR, TAG, "Couldn't cancel IDecoder: %i", ret);
         return;
     }
 }
diff --git a/jni/libmediaplayer/thread.cpp b/jni/libmediaplayer/thread.cpp
@@ -15,6 +15,10 @@ void Thread::startAsync()
 
 int Thread::wait()
 {
+	if(!mRunning)
+	{
+		return 0;
+	}
     return pthread_join(mThread, NULL);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void IDecoder::stop()`
`35`	`35`	`__android_log_print(ANDROID_LOG_INFO, TAG, "waiting on end of decoder thread");`
`36`	`36`	`int ret = -1;`
`37`	`37`	`if((ret = wait()) != 0) {`
`38`		`- __android_log_print(ANDROID_LOG_ERROR, TAG, "Couldn't cancel audio IDecoder: %i", ret);`
	`38`	`+ __android_log_print(ANDROID_LOG_ERROR, TAG, "Couldn't cancel IDecoder: %i", ret);`
`39`	`39`	`return;`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ void Thread::startAsync()`
`15`	`15`
`16`	`16`	`int Thread::wait()`
`17`	`17`	`{`
	`18`	`+ if(!mRunning)`
	`19`	`+ {`
	`20`	`+ return 0;`
	`21`	`+ }`
`18`	`22`	`return pthread_join(mThread, NULL);`
`19`	`23`	`}`
`20`	`24`