diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/xml/helper-observer.cpp | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/xml/helper-observer.cpp')
| -rw-r--r-- | src/xml/helper-observer.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/xml/helper-observer.cpp b/src/xml/helper-observer.cpp index ce902ba75..c54dd8e74 100644 --- a/src/xml/helper-observer.cpp +++ b/src/xml/helper-observer.cpp @@ -13,10 +13,16 @@ void SignalObserver::set(SPObject* o) { // XML Tree being used direcly in this function in the following code // while it shouldn't be - if(_oldsel && _oldsel->getRepr()) - _oldsel->getRepr()->removeObserver(*this); - if(o && o->getRepr()) - o->getRepr()->addObserver(*this); + if(_oldsel) { + if (_oldsel->getRepr()) { + _oldsel->getRepr()->removeObserver(*this); + } + } + if(o) { + if (o->getRepr()) { + o->getRepr()->addObserver(*this); + } + } _oldsel = o; } |