diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
| commit | e65a02ed32b78534739aba24929ece7c44dd967f (patch) | |
| tree | 13cf022f18f6b5bae46aad4bc339e512f069a514 /src/graphlayout.cpp | |
| parent | Pull 2Geom revision 2013 (extra constructors for Rect). (diff) | |
| parent | Text edit dialog: Apply button should grab default only after adding to window (diff) | |
| download | inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.tar.gz inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.zip | |
Merge from trunk
(bzr r10347.1.5)
Diffstat (limited to 'src/graphlayout.cpp')
| -rw-r--r-- | src/graphlayout.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp index 41e523b86..57002bfb6 100644 --- a/src/graphlayout.cpp +++ b/src/graphlayout.cpp @@ -157,11 +157,12 @@ void graphlayout(GSList const *const items) { ++i) { SPItem *iu=*i; - map<string,unsigned>::iterator i=nodelookup.find(iu->getId()); - if(i==nodelookup.end()) { + map<string,unsigned>::iterator i_iter=nodelookup.find(iu->getId()); + map<string,unsigned>::iterator i_iter_end=nodelookup.end(); + if(i_iter==i_iter_end) { continue; } - unsigned u=i->second; + unsigned u=i_iter->second; GSList *nlist=iu->avoidRef->getAttachedConnectors(Avoid::runningFrom); list<SPItem *> connectors; |