Merge pull request #70 from Nekotekina/rpcs3

and conflicts fixed.
2014-02-13 12:13:05 +01:00
parent 5953781c13
commit 373d189edb
29 changed files with 1231 additions and 479 deletions
@@ -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);
 	}