Small shutdown crash bug fixed

git-svn-id: https://opentibia.svn.sourceforge.net/svnroot/opentibia/otserv/trunk@6269 c77455bc-2124-0410-8220-ac9e7aafbb94

otserv.cpp

@@ -256,6 +256,8 @@ int main(int argc, char** argv)
 		std::cout << "[done]" << std::endl;
 		std::cout << ":: Server Running..." << std::endl;
 		servicer.run();
+		g_scheduler.join();
+		g_dispatcher.join();
 	}
 	else{
 		ErrorMessage("No services running. Server is not online.");

scheduler.cpp

@@ -32,7 +32,7 @@ Scheduler::Scheduler()
 void Scheduler::start()
 {
 	m_threadState = STATE_RUNNING;
-	boost::thread(boost::bind(&Scheduler::schedulerThread, (void*)this));
+	m_thread = boost::thread(boost::bind(&Scheduler::schedulerThread, (void*)this));
 }
 
 void Scheduler::schedulerThread(void* p)
@@ -205,3 +205,7 @@ void Scheduler::shutdown()
 	m_eventLock.unlock();
 }
 
+void Scheduler::join()
+{
+	m_thread.join();
+}

scheduler.h

@@ -87,6 +87,7 @@ class Scheduler
 	void start();
 	void stop();
 	void shutdown();
+	void join();
 
 	enum SchedulerState{
 		STATE_RUNNING,
@@ -97,6 +98,7 @@ class Scheduler
 protected:
 	static void schedulerThread(void* p);
 
+	boost::thread m_thread;
 	boost::mutex m_eventLock;
 	boost::condition_variable m_eventSignal;
 

tasks.cpp

@@ -35,7 +35,7 @@ Dispatcher::Dispatcher()
 void Dispatcher::start()
 {
 	m_threadState = STATE_RUNNING;
-	boost::thread(boost::bind(&Dispatcher::dispatcherThread, (void*)this));
+	m_thread = boost::thread(boost::bind(&Dispatcher::dispatcherThread, (void*)this));
 }
 
 void Dispatcher::dispatcherThread(void* p)
@@ -174,3 +174,8 @@ void Dispatcher::shutdown()
 	std::cout << "Shutdown Dispatcher" << std::endl;
 	#endif
 }
+
+void Dispatcher::join()
+{
+	m_thread.join();
+}

tasks.h

@@ -84,6 +84,7 @@ class Dispatcher{
 	void start();
 	void stop();
 	void shutdown();
+	void join();
 
 	enum DispatcherState{
 		STATE_RUNNING,
@@ -97,6 +98,7 @@ class Dispatcher{
 
 	void flush();
 
+	boost::thread m_thread;
 	boost::mutex m_taskLock;
 	boost::condition_variable m_taskSignal;