Hi,
the attached patch resolves a deadlock issue in src/Features/Relation.cpp.
--
Lutz Mändle Internet: [email protected]
Berlin/Germany
diff -Naur ./orig/merkaartor/src/Features/Relation.cpp ./patched/merkaartor/src/Features/Relation.cpp
--- ./orig/merkaartor/src/Features/Relation.cpp 2015-03-17 20:50:45.000000000 +0100
+++ ./patched/merkaartor/src/Features/Relation.cpp 2015-03-31 22:45:03.000000000 +0200
@@ -555,6 +555,8 @@
p->PathUpToDate = false;
p->CalculateWidth();
+ MetaUpToDate = true;
+
p->theRenderPriority = RenderPriority(RenderPriority::IsSingular, 0., 0);
for (int i=0; i<p->Members.size(); ++i) {
if (Way* W = CAST_WAY(p->Members.at(i).second)) {
@@ -565,7 +567,6 @@
p->theRenderPriority = R->renderPriority();
}
}
- MetaUpToDate = true;
}
bool Relation::toXML(QXmlStreamWriter& stream, QProgressDialog * progress, bool strict, QString changetsetid)
_______________________________________________
Merkaartor mailing list
[email protected]
https://lists.openstreetmap.org/listinfo/merkaartor
