fix small merge mistake

This commit is contained in:
Bigpet committed 2014-02-23 18:21:10 +01:00
commit 1be8563fdb
47 files changed
+3065 -785

No files matched your search

+3 -2
View File
@@ -115,10 +115,11 @@ 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;
try
{
NamedThreadBase info(m_name);
g_tls_this_thread = &info;
func();
}
catch(...)