DropdownWidget::addItem: Use smart pointers in closure

Warzone2100 · Dec 10, 2021 · 1077757 · 1077757
1 parent c002eef
commit 1077757
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/lib/widget/dropdown.cpp b/lib/widget/dropdown.cpp
@@ -189,14 +189,17 @@ void DropdownWidget::display(int xOffset, int yOffset)
 
 void DropdownWidget::addItem(const std::shared_ptr<WIDGET> &item)
 {
-	auto itemOnSelect = [this](std::shared_ptr<DropdownItemWrapper> selected) {
-		if (!overlayScreen) {
-			open();
+	std::weak_ptr<DropdownWidget> pWeakThis(std::dynamic_pointer_cast<DropdownWidget>(shared_from_this()));
+	auto itemOnSelect = [pWeakThis](std::shared_ptr<DropdownItemWrapper> selected) {
+		auto psStrongDropdown = pWeakThis.lock();
+		ASSERT_OR_RETURN(, psStrongDropdown != nullptr, "DropdownWidget no longer exists?");
+		if (!psStrongDropdown->overlayScreen) {
+			psStrongDropdown->open();
 			return;
 		}
 
-		select(selected);
-		close();
+		psStrongDropdown->select(selected);
+		psStrongDropdown->close();
 	};
 
 	auto wrapper = DropdownItemWrapper::make(item, itemOnSelect);