From c5ca7a3c4fbf9b058b784964db99c219ece54a1f Mon Sep 17 00:00:00 2001 From: lisyarus Date: Sun, 13 Mar 2022 17:20:59 +0300 Subject: [PATCH] Fix ui::spawn(selector) destruction order on close --- libs/ui/source/selector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ui/source/selector.cpp b/libs/ui/source/selector.cpp index 30fb54ac..1adda650 100644 --- a/libs/ui/source/selector.cpp +++ b/libs/ui/source/selector.cpp @@ -149,11 +149,11 @@ namespace psemek::ui positioner->set_child(selector); auto close = [event_interceptor = event_interceptor.get(), selector = selector.get()]{ + selector->on_selected([](std::size_t){}); + auto p = dynamic_cast(event_interceptor->parent()); if (p) p->remove_child(event_interceptor); - - selector->on_selected([](std::size_t){}); }; selector->on_selected([close, cb = std::move(on_selected)](std::size_t index){