From c4c77d4826cabf2d41e8614225609427f57fa1f4 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sat, 1 Dec 2018 17:07:55 +0100
Subject: Fix merge to master and add shortcut

---
 src/desktop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/desktop.cpp')

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);
-- 
cgit v1.2.3