Merge pull request #70 from Nekotekina/rpcs3

and conflicts fixed.

Utilities/IdManager.h

@@ -132,10 +132,12 @@ public:
 
 	bool HasID(const s64 id)
 	{
-		std::lock_guard<std::mutex> lock(m_mtx_main);
+		{
+			std::lock_guard<std::mutex> lock(m_mtx_main);
 
-		if(id == wxID_ANY)
-			return m_id_map.begin() != m_id_map.end();
+			if(id == wxID_ANY)
+				return m_id_map.begin() != m_id_map.end();
+		}
 
 		return CheckID(id);
 	}

Utilities/SMutex.h

@@ -1,5 +1,4 @@
 #pragma once
-#include <atomic>
 
 extern void SM_Sleep();
 extern DWORD SM_GetCurrentThreadId();
@@ -49,6 +48,10 @@ public:
 
 	SMutexResult trylock(T tid)
 	{
+		if (Emu.IsStopped())
+		{
+			return SMR_ABORT;
+		}
 		T old = (T)free_value;
 
 		if (!owner.compare_exchange_strong(old, tid))
@@ -57,15 +60,10 @@ public:
 			{
 				return SMR_DEADLOCK;
 			}
-			if (Emu.IsStopped())
-			{
-				return SMR_ABORT;
-			}
 			if (old == (T)dead_value)
 			{
 				return SMR_DESTROYED;
 			}
-
 			return SMR_FAILED;
 		}
 
@@ -74,6 +72,10 @@ public:
 
 	SMutexResult unlock(T tid, T to = (T)free_value)
 	{
+		if (Emu.IsStopped())
+		{
+			return SMR_ABORT;
+		}
 		T old = tid;
 
 		if (!owner.compare_exchange_strong(old, to))

Utilities/Thread.cpp

@@ -111,7 +111,7 @@ thread::thread()
 }
 
 void thread::start(std::function<void()> func)
-{
+{ // got a crash related with strings
 	m_thr = std::thread([this, func]() { NamedThreadBase info(m_name); g_tls_this_thread = &info; func(); });
 }