diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-07-05 13:28:06 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-07-05 13:28:06 +0000 |
| commit | 6456d475232772dac4f22f7e31b9b43a0155b335 (patch) | |
| tree | d954c8837a33d62df2bc3df930e75f9234fc8691 /src/libavoid | |
| parent | Fix make check (diff) | |
| parent | Put correctly doubles in a function (diff) | |
| download | inkscape-6456d475232772dac4f22f7e31b9b43a0155b335.tar.gz inkscape-6456d475232772dac4f22f7e31b9b43a0155b335.zip | |
Update to experimental r13418
(bzr r13090.1.87)
Diffstat (limited to 'src/libavoid')
| -rw-r--r-- | src/libavoid/connector.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/libavoid/connector.cpp b/src/libavoid/connector.cpp index 8dcb66f2d..b8c99a48c 100644 --- a/src/libavoid/connector.cpp +++ b/src/libavoid/connector.cpp @@ -442,11 +442,11 @@ void ConnRef::makeActive(void) void ConnRef::makeInactive(void) { - COLA_ASSERT(_active); - - // Remove from connRefs list. - _router->connRefs.erase(_pos); - _active = false; + if (_active) { + // Remove from connRefs list. + _router->connRefs.erase(_pos); + _active = false; + } } @@ -553,8 +553,12 @@ void ConnRef::unInitialise(void) void ConnRef::removeFromGraph(void) { - _srcVert->removeFromGraph(); - _dstVert->removeFromGraph(); + if (_srcVert) { + _srcVert->removeFromGraph(); + } + if (_dstVert) { + _dstVert->removeFromGraph(); + } } |