summaryrefslogtreecommitdiff
path: root/src/gui/questswindow.cpp
diff options
context:
space:
mode:
authorSocapex <philippe_groarke@yahoo.ca>2013-01-19 21:02:01 -0500
committerSocapex <philippe_groarke@yahoo.ca>2013-01-19 21:02:01 -0500
commitdf606ace309acaf0c78f52e1f98eabed6c844ae2 (patch)
treed9799b0e4a507d9eacbbafc1755eecea03f0b373 /src/gui/questswindow.cpp
parentd0169223b889a115b486e974e5b287c3ccb00d85 (diff)
parent678d4e70999ade5a36862039875aa5564291d09d (diff)
downloadmanaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.gz
manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.bz2
manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.xz
manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.zip
Merge remote-tracking branch 'upstream/master' into osx
Diffstat (limited to 'src/gui/questswindow.cpp')
-rw-r--r--src/gui/questswindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp
index 16fe7190b..cb03904a9 100644
--- a/src/gui/questswindow.cpp
+++ b/src/gui/questswindow.cpp
@@ -205,7 +205,7 @@ void QuestsWindow::loadQuest(const int var, const XmlNodePtr node)
quest->group = XML::getProperty(node, "group", "");
std::string incompleteStr = XML::getProperty(node, "incomplete", "");
std::string completeStr = XML::getProperty(node, "complete", "");
- if (incompleteStr.empty() || completeStr.empty())
+ if (incompleteStr.empty() && completeStr.empty())
{
logger->log("complete flags incorrect");
delete quest;