From a8a7e28708a5c0741c013247cd3f3dc985d0fb57 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 16 Nov 2016 14:45:43 +0100 Subject: Fix crash with nested xdg popups Popups that are children of popups would get a null parent in pure-qml. This would cause a crash in XdgPopupV5Integration. This change fixes pure-qml to set the parent correctly, and also adds null pointer checks to XdgPopupV5Integration. Change-Id: Ica5bd6c1a0853fbec1b30bc6ffff806b2cfd15f8 Reviewed-by: Johan Helsing --- examples/wayland/pure-qml/qml/main.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'examples/wayland/pure-qml/qml/main.qml') diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml index 9bce7bcb8..5eece078b 100644 --- a/examples/wayland/pure-qml/qml/main.qml +++ b/examples/wayland/pure-qml/qml/main.qml @@ -81,7 +81,8 @@ WaylandCompositor { } onXdgPopupCreated: { var parentView = viewsBySurface[xdgPopup.parentSurface]; - chromeComponent.createObject(parentView, { "shellSurface": xdgPopup } ); + var item = chromeComponent.createObject(parentView, { "shellSurface": xdgPopup } ); + viewsBySurface[xdgPopup.surface] = item; } } -- cgit v1.2.3