Merge branch 'crashlog_improvements' into jgrpp

# Conflicts:
#	source.list
#	src/openttd.cpp
#	src/stdafx.h
#	src/vehicle.cpp

src/thread/thread.h

@@ -123,4 +123,14 @@ private:
  */
 uint GetCPUCoreCount();
 
+/**
+ * Set the current thread as the "main" thread
+ */
+void SetSelfAsMainThread();
+
+/**
+ * @return true if the current thread definitely the "main" thread. If in doubt returns false.
+ */
+bool IsMainThread();
+
 #endif /* THREAD_H */

src/thread/thread_morphos.cpp

@@ -199,3 +199,7 @@ private:
 	if (thread != NULL) *thread = to;
 	return true;
 }
+
+void SetSelfAsMainThread() { }
+
+bool IsMainThread() { return false; }

src/thread/thread_none.cpp

@@ -33,3 +33,7 @@ public:
 {
 	return new ThreadMutex_None();
 }
+
+void SetSelfAsMainThread() { }
+
+bool IsMainThread() { return true; }

src/thread/thread_os2.cpp

@@ -145,3 +145,7 @@ public:
 {
 	return new ThreadMutex_OS2();
 }
+
+void SetSelfAsMainThread() { }
+
+bool IsMainThread() { return false; }

src/thread/thread_pthread.cpp

@@ -182,3 +182,15 @@ public:
 {
 	return new ThreadMutex_pthread();
 }
+
+static pthread_t main_thread;
+
+void SetSelfAsMainThread()
+{
+	main_thread = pthread_self();
+}
+
+bool IsMainThread()
+{
+	return main_thread == pthread_self();
+}

src/thread/thread_win32.cpp

@@ -158,3 +158,15 @@ public:
 {
 	return new ThreadMutex_Win32();
 }
+
+static uint main_thread_id;
+
+void SetSelfAsMainThread()
+{
+	main_thread_id = GetCurrentThreadId();
+}
+
+bool IsMainThread()
+{
+	return main_thread_id == GetCurrentThreadId();
+}