Thanks, I've commited both patches! > Hi, > > after digging in the code I've found a potential deadlock similar to > the deadlock in src/Features/Relation.cpp in src/Features/Way.cpp. > The attached patch resolves this. > > -- > Lutz Mändle Internet: lmaen...@gmx.net > Berlin/Germany > >
> diff -Naur ./orig/merkaartor/src/Features/Way.cpp > ./patched/merkaartor/src/Features/Way.cpp > --- ./orig/merkaartor/src/Features/Way.cpp 2015-03-23 22:18:17.000000000 > +0100 > +++ ./patched/merkaartor/src/Features/Way.cpp 2015-04-01 03:40:05.000000000 > +0200 > @@ -407,6 +407,8 @@ > p->Distance = 0; > p->CalculateWidth(); > > + MetaUpToDate = true; > + > p->NotEverythingDownloaded = false; > if (lastUpdated() == Feature::NotYetDownloaded) > p->NotEverythingDownloaded = true; > @@ -449,7 +451,6 @@ > } > > p->doUpdateVirtuals(); > - MetaUpToDate = true; > } > > qreal Way::distance() > _______________________________________________ > Merkaartor mailing list > Merkaartor@openstreetmap.org > https://lists.openstreetmap.org/listinfo/merkaartor -- S pozdravem Ladislav Láska <la...@kam.mff.cuni.cz> Katedra Aplikované Matematiky, MFF UK tel.: +420 739 464 167 _______________________________________________ Merkaartor mailing list Merkaartor@openstreetmap.org https://lists.openstreetmap.org/listinfo/merkaartor