From e8e8a63054db6f3563a005df2e72a1fd836598a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 20 Dec 2022 12:41:31 +0100 Subject: [PATCH] core/delete: Avoid warnings when there is no close dialog The "ensure dialog" function didn't ensure there was a dialog created, so the function was renamed. The callers was updated to handle the dialog not being created. Part-of: --- src/core/delete.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/delete.c b/src/core/delete.c index 48cecdaca..1270ea089 100644 --- a/src/core/delete.c +++ b/src/core/delete.c @@ -46,7 +46,7 @@ close_dialog_response_cb (MetaCloseDialog *dialog, } static void -meta_window_ensure_close_dialog (MetaWindow *window) +meta_window_maybe_ensure_close_dialog (MetaWindow *window) { MetaDisplay *display; @@ -65,7 +65,11 @@ meta_window_ensure_close_dialog (MetaWindow *window) void meta_window_show_close_dialog (MetaWindow *window) { - meta_window_ensure_close_dialog (window); + meta_window_maybe_ensure_close_dialog (window); + + if (!window->close_dialog) + return; + meta_close_dialog_show (window->close_dialog); if (window->display &&