X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fthreadwrapper%2Fthreadedexector.cpp;h=c9eaf33b18060688fab0567e8dfd515ed288a608;hb=76805933f794915a72b7f0a21b12af6654759f4f;hp=72c04c2ee7aa0a9b7e54e09a8c45ce5c3ec34f9c;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/src/threadwrapper/threadedexector.cpp b/src/threadwrapper/threadedexector.cpp
index 72c04c2..c9eaf33 100644
--- a/src/threadwrapper/threadedexector.cpp
+++ b/src/threadwrapper/threadedexector.cpp
@@ -39,9 +39,13 @@ void ThreadedExecutor::CleanupCompleted()
 
 void ThreadedExecutor::Join()
 {
+	CleanupCompleted();
 	for(std::vector<CancelableThread *>::iterator i=m_threads.begin(); i!=m_threads.end(); i++)
 	{
-		(*i)->join();
+		if((*i)->isRunning())
+		{
+			(*i)->join();
+		}
 	}
 	CleanupCompleted();
 }