From 16b6bdbb7c160d95473256c7b414125310af25fe Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sat, 1 Dec 2018 17:47:43 +0100
Subject: Fix merging

---
 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 f857ed236..2f9d6c20a 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) ? static_cast<SPItem *>(ai->data()) : nullptr;
+        SPItem *spi = ai->getItem();
         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