aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-10-21 08:54:03 +0200
committerdec05eba <dec05eba@protonmail.com>2018-10-21 08:54:06 +0200
commitd360307d129d879897c00c1ced2f72adc502f486 (patch)
treea9f9f3b680a67dd829ae5447d72b6bd5c7033e4b
parente130d8e537869caa5597be8597fc40e787a2f35e (diff)
Fix concurrent connection to an address
m---------depends/odhtdb0
-rw-r--r--include/Channel.hpp1
-rw-r--r--src/main.cpp2
3 files changed, 1 insertions, 2 deletions
diff --git a/depends/odhtdb b/depends/odhtdb
-Subproject 0554e4bfdf2e24419c2b9facceaecc6e9d4764e
+Subproject d505a277e74a3a8029ee02d8b2e36b5f1c85af9
diff --git a/include/Channel.hpp b/include/Channel.hpp
index 34752da..8c08244 100644
--- a/include/Channel.hpp
+++ b/include/Channel.hpp
@@ -16,7 +16,6 @@
#include <odhtdb/Hash.hpp>
#include <odhtdb/DhtKey.hpp>
#include <odhtdb/Database.hpp>
-#include <future>
namespace dchat
diff --git a/src/main.cpp b/src/main.cpp
index 3518e3b..afdff99 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -264,7 +264,7 @@ int main(int argc, char **argv)
printf("Resource path set to: %s\n", resourcesPath.string().c_str());
}
else
- printf("Resource directory not defined, using currently directory\n");
+ printf("Resource directory not defined, using current directory\n");
const sf::Int64 FRAMERATE_FOCUSED = 144;
const sf::Int64 FRAMERATE_NOT_FOCUSED = 10;