diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-11-05 17:10:22 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-11-05 17:10:22 +0000 |
| commit | 218c1acafd09c2b2469db082cf6e389869f9c48e (patch) | |
| tree | c7324d131df0a85effbc548e1ee35446aff25fdd /src/object-set.h | |
| parent | Fix angle constrain, thanks to vlada, Mc and LiamW (diff) | |
| parent | Move a header place (diff) | |
| download | inkscape-218c1acafd09c2b2469db082cf6e389869f9c48e.tar.gz inkscape-218c1acafd09c2b2469db082cf6e389869f9c48e.zip | |
Update to trunk
(bzr r15142.1.30)
Diffstat (limited to 'src/object-set.h')
| -rw-r--r-- | src/object-set.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/object-set.h b/src/object-set.h index 8fa20e454..a70730ef1 100644 --- a/src/object-set.h +++ b/src/object-set.h @@ -104,7 +104,8 @@ public: typedef decltype(MultiIndexContainer().get<random_access>() | boost::adaptors::filtered(is_item()) | boost::adaptors::transformed(object_to_node())) XMLNodeRange; ObjectSet(SPDesktop* desktop): _desktop(desktop) { - _document = desktop->getDocument(); + if (desktop) + _document = desktop->getDocument(); }; ObjectSet(SPDocument* doc): _desktop(nullptr), _document(doc) {}; ObjectSet(): _desktop(nullptr), _document(nullptr) {}; |