diff options
| author | Martin Owens <doctormo@gmail.com> | 2018-09-27 15:57:43 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2018-09-27 15:57:43 +0000 |
| commit | 717a26eb64c59d599cf76444371a4085bfffceb4 (patch) | |
| tree | 0d4ff1f68111a41c9253664051c571b8f08e8430 /src/document.cpp | |
| parent | Make attrdialog use the new iconrenderer sigc++ signal (diff) | |
| parent | SP_ACTIVE_DESKTOP: check for NULL or eliminate (diff) | |
| download | inkscape-717a26eb64c59d599cf76444371a4085bfffceb4.tar.gz inkscape-717a26eb64c59d599cf76444371a4085bfffceb4.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/document.cpp')
| -rw-r--r-- | src/document.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/document.cpp b/src/document.cpp index a9a254a06..792e6fe4b 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -1608,10 +1608,11 @@ std::vector<SPItem*> SPDocument::getItemsAtPoints(unsigned const key, std::vecto build_flat_item_list(key, SP_GROUP(this->root), true); _node_cache_valid=true; } - SPObject *current_layer = SP_ACTIVE_DESKTOP->currentLayer(); + SPObject *current_layer = nullptr; SPDesktop *desktop = SP_ACTIVE_DESKTOP; Inkscape::LayerModel *layer_model = nullptr; if(desktop){ + current_layer = desktop->currentLayer(); layer_model = desktop->layers; } size_t item_counter = 0; |