summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-01-24 15:58:40 +0100
committerMattes D <github@xoft.cz>2015-01-27 14:53:29 +0100
commit7cff25f0ffa70bf142663ccdc320bf86dfb623dd (patch)
tree4df8d76f45a8a27391c07995e44e34c28cb218ad
parentRCON server: fixed compilation. (diff)
downloadcuberite-7cff25f0ffa70bf142663ccdc320bf86dfb623dd.tar
cuberite-7cff25f0ffa70bf142663ccdc320bf86dfb623dd.tar.gz
cuberite-7cff25f0ffa70bf142663ccdc320bf86dfb623dd.tar.bz2
cuberite-7cff25f0ffa70bf142663ccdc320bf86dfb623dd.tar.lz
cuberite-7cff25f0ffa70bf142663ccdc320bf86dfb623dd.tar.xz
cuberite-7cff25f0ffa70bf142663ccdc320bf86dfb623dd.tar.zst
cuberite-7cff25f0ffa70bf142663ccdc320bf86dfb623dd.zip
-rw-r--r--src/StringUtils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp
index 48486a762..4eb2d48b6 100644
--- a/src/StringUtils.cpp
+++ b/src/StringUtils.cpp
@@ -914,7 +914,7 @@ AStringVector MergeStringVectors(const AStringVector & a_Strings1, const AString
// Add each item from strings2 that is not already present:
for (auto item : a_Strings2)
{
- if (std::find(res.begin(), res.end(), item) != res.end())
+ if (std::find(res.begin(), res.end(), item) == res.end())
{
res.push_back(item);
}