summaryrefslogtreecommitdiffstats
path: root/src/GlobalState.cpp
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2018-01-05 16:12:13 +0100
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2018-01-13 03:39:34 +0100
commitf090b30e587c7af51fde86f36c67ef139ed2ce6f (patch)
tree727f1f77da4a5a630aa18083713989aaf1a919a9 /src/GlobalState.cpp
parentAll usages of previous event-system replaced with new event-system (diff)
downloadAltCraft-f090b30e587c7af51fde86f36c67ef139ed2ce6f.tar
AltCraft-f090b30e587c7af51fde86f36c67ef139ed2ce6f.tar.gz
AltCraft-f090b30e587c7af51fde86f36c67ef139ed2ce6f.tar.bz2
AltCraft-f090b30e587c7af51fde86f36c67ef139ed2ce6f.tar.lz
AltCraft-f090b30e587c7af51fde86f36c67ef139ed2ce6f.tar.xz
AltCraft-f090b30e587c7af51fde86f36c67ef139ed2ce6f.tar.zst
AltCraft-f090b30e587c7af51fde86f36c67ef139ed2ce6f.zip
Diffstat (limited to 'src/GlobalState.cpp')
-rw-r--r--src/GlobalState.cpp3
1 files changed, 2 insertions, 1 deletions
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) {