From f090b30e587c7af51fde86f36c67ef139ed2ce6f Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Fri, 5 Jan 2018 18:12:13 +0300
Subject: Tried to fix deadlock

---
 src/GlobalState.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/GlobalState.cpp')

diff --git a/src/GlobalState.cpp b/src/GlobalState.cpp
index 2bd4943..e947e01 100644
--- a/src/GlobalState.cpp
+++ b/src/GlobalState.cpp
@@ -45,7 +45,7 @@ void InitEvents() {
         }
         catch (std::exception &e) {
             LOG(WARNING) << "Connection failed";
-			PUSH_EVENT("ConnectionFailed", e.what());
+			PUSH_EVENT("ConnectionFailed", std::string(e.what()));
             return;
         }
         LOG(INFO) << "Connected to server";
@@ -177,6 +177,7 @@ void PhysExec() {
 }
 
 void GsExec() {
+    el::Helpers::setThreadName("Game");
     LoopExecutionTimeController timer(std::chrono::milliseconds(16));
 
     while (isRunning) {
-- 
cgit v1.2.3