From c3616927ebfcbe98375189be87821bea202d9587 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Nov 2022 19:22:03 +0400
Subject: [PATCH] Add CreateAddActionCallback for non-owned menu.

---
 ui/widgets/menu/menu_add_action_callback_factory.cpp | 10 +++++++---
 ui/widgets/menu/menu_add_action_callback_factory.h   |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ui/widgets/menu/menu_add_action_callback_factory.cpp b/ui/widgets/menu/menu_add_action_callback_factory.cpp
index 2d1c73e..6b2ed64 100644
--- a/ui/widgets/menu/menu_add_action_callback_factory.cpp
+++ b/ui/widgets/menu/menu_add_action_callback_factory.cpp
@@ -14,9 +14,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui::Menu {
 
-MenuCallback CreateAddActionCallback(
-		const base::unique_qptr<Ui::PopupMenu> &menu) {
-	return MenuCallback([&](MenuCallback::Args a) {
+MenuCallback CreateAddActionCallback(not_null<Ui::PopupMenu*> menu) {
+	return MenuCallback([=](MenuCallback::Args a) {
 		if (a.fillSubmenu) {
 			const auto action = menu->addAction(
 				a.text,
@@ -43,4 +42,9 @@ MenuCallback CreateAddActionCallback(
 	});
 }
 
+MenuCallback CreateAddActionCallback(
+		const base::unique_qptr<Ui::PopupMenu> &menu) {
+	return CreateAddActionCallback(menu.get());
+}
+
 } // namespace Ui::Menu
diff --git a/ui/widgets/menu/menu_add_action_callback_factory.h b/ui/widgets/menu/menu_add_action_callback_factory.h
index 3d9b37a..5091845 100644
--- a/ui/widgets/menu/menu_add_action_callback_factory.h
+++ b/ui/widgets/menu/menu_add_action_callback_factory.h
@@ -17,6 +17,8 @@ namespace Ui::Menu {
 
 struct MenuCallback;
 
+[[nodiscard]] MenuCallback CreateAddActionCallback(
+	not_null<Ui::PopupMenu*> menu);
 [[nodiscard]] MenuCallback CreateAddActionCallback(
 	const base::unique_qptr<Ui::PopupMenu> &menu);