From d19a69cd0d22dfbe802286baf8b33ebb8c6f4fa2 Mon Sep 17 00:00:00 2001
From: sapier <Sapier at GMX dot net>
Date: Sat, 30 Nov 2013 01:51:54 +0100
Subject: Fix broken thread stop handling

---
 src/script/lua_api/l_async_events.cpp | 11 +++++++----
 src/script/lua_api/l_async_events.h   |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/script/lua_api')

diff --git a/src/script/lua_api/l_async_events.cpp b/src/script/lua_api/l_async_events.cpp
index cc4644cdf..63ca87aed 100644
--- a/src/script/lua_api/l_async_events.cpp
+++ b/src/script/lua_api/l_async_events.cpp
@@ -149,9 +149,11 @@ LuaJobInfo AsyncEngine::getJob() {
 	m_JobQueueMutex.Lock();
 
 	LuaJobInfo retval;
+	retval.valid = false;
 
 	if (m_JobQueue.size() != 0) {
 		retval = m_JobQueue.front();
+		retval.valid = true;
 		m_JobQueue.erase((m_JobQueue.begin()));
 	}
 	m_JobQueueMutex.Unlock();
@@ -322,11 +324,12 @@ void* AsyncWorkerThread::worker_thread_main() {
 			assert("no future with broken builtin async environment scripts" == 0);
 	}
 	/** main loop **/
-	while(IsRunning()) {
+	while(!StopRequested()) {
 		//wait for job
 		LuaJobInfo toprocess = m_JobDispatcher->getJob();
 
-		if (!IsRunning()) { continue; }
+		if (toprocess.valid == false) { continue; }
+		if (StopRequested()) { continue; }
 
 		//first push error handler
 		lua_pushcfunction(m_LuaStack, script_error_handler);
@@ -350,7 +353,7 @@ void* AsyncWorkerThread::worker_thread_main() {
 						toprocess.serializedParams.c_str(),
 						toprocess.serializedParams.length());
 
-		if (!IsRunning()) { continue; }
+		if (StopRequested()) { continue; }
 		if(lua_pcall(m_LuaStack, 2, 2, errorhandler)) {
 			scriptError("Async WORKER thread: %s\n", lua_tostring(m_LuaStack, -1));
 			toprocess.serializedResult="ERROR";
@@ -362,7 +365,7 @@ void* AsyncWorkerThread::worker_thread_main() {
 			toprocess.serializedResult = std::string(retval,lenght);
 		}
 
-		if (!IsRunning()) { continue; }
+		if (StopRequested()) { continue; }
 		//put job result
 		m_JobDispatcher->putJobResult(toprocess);
 	}
diff --git a/src/script/lua_api/l_async_events.h b/src/script/lua_api/l_async_events.h
index 347d9c0fc..079a08009 100644
--- a/src/script/lua_api/l_async_events.h
+++ b/src/script/lua_api/l_async_events.h
@@ -57,6 +57,8 @@ struct LuaJobInfo {
 	std::string serializedResult;
 	/** jobid used to identify a job and match it to callback **/
 	unsigned int JobId;
+	/** valid marker **/
+	bool valid;
 };
 
 /** class encapsulating a asynchronous working environment **/
-- 
cgit v1.2.3