summaryrefslogtreecommitdiffstats
path: root/src/desktop.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2018-12-01 16:07:55 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2018-12-01 16:17:15 +0000
commitc4c77d4826cabf2d41e8614225609427f57fa1f4 (patch)
tree0a40b9be68336b3cd7be2f112414dcbd4157b292 /src/desktop.cpp
parentAdd scrool insensitive and reset if desktop change size (diff)
downloadinkscape-c4c77d4826cabf2d41e8614225609427f57fa1f4.tar.gz
inkscape-c4c77d4826cabf2d41e8614225609427f57fa1f4.zip
Fix merge to master and add shortcut
Diffstat (limited to 'src/desktop.cpp')
-rw-r--r--src/desktop.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp
index 902e4f62e..45026102b 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -1818,7 +1818,7 @@ static gint
_arena_handler (SPCanvasArena */*arena*/, Inkscape::DrawingItem *ai, GdkEvent *event, SPDesktop *desktop)
{
if (ai) {
- SPItem *spi = ai->getItem();
+ SPItem *spi = (ai) ? static_cast<SPItem *>(ai->data()) : nullptr;
return sp_event_context_item_handler (desktop->event_context, spi, event);
} else {
return sp_event_context_root_handler (desktop->event_context, event);