Merge branch 'master' of https://github.com/DHrpcs3/rpcs3

2014-02-03 01:20:48 +04:00
parent 7fce5589f8 8ba8d35541
commit a0c8e116df
22 changed files with 220 additions and 84 deletions
@@ -36,7 +36,7 @@ CPUThread& CPUThreadManager::AddThread(CPUThreadType type)
 	default: assert(0);
 	}
 	
-	new_thread->SetId(Emu.GetIdManager().GetNewID(wxString::Format("%s Thread", new_thread->GetTypeString().mb_str()), new_thread));
+	new_thread->SetId(Emu.GetIdManager().GetNewID(wxString::Format("%s Thread", new_thread->GetTypeString().mb_str()).mb_str(), new_thread));

 	m_threads.Add(new_thread);
 #ifndef QT_UI