wl: Ensure destroying the previous popup

... and reset the reference in the Platform if the destroyed popup is the same.
bykov34 · Mar 14, 2024 · e7a1ad5 · e7a1ad5
1 parent c781c9c
commit e7a1ad5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c
@@ -1405,7 +1405,10 @@ void
 cog_wl_platform_popup_create(CogWlViewport *viewport, WebKitOptionMenu *option_menu)
 {
     CogWlPlatform *platform = (CogWlPlatform *) cog_platform_get();
-    g_assert(!platform->popup);
+
+    // Destroy the still alive previous popup
+    if (platform->popup)
+        cog_wl_platform_popup_destroy();
 
     CogWlPopup *popup = cog_wl_popup_create(viewport, option_menu);
     platform->popup = popup;

diff --git a/platform/wayland/cog-utils-wl.c b/platform/wayland/cog-utils-wl.c
@@ -343,6 +343,11 @@ cog_wl_popup_destroy(CogWlPopup *popup)
     g_debug("%s: Destroying @ %p", G_STRFUNC, popup);
     g_assert(popup);
 
+    // Reset the reference in the Platform if the destroyed popup is the same
+    CogWlPlatform *platform = (CogWlPlatform *) cog_platform_get();
+    if (platform->popup == popup)
+        platform->popup = NULL;
+
     if (popup->option_menu != NULL)
         webkit_option_menu_close(popup->option_menu);