From d1bdc363314557d88ac344365b8d08697968fcdb Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 9 Nov 2022 16:12:01 +0100
Subject: [PATCH] window: fixups

---
 gtk/gtkwindow.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index aba22c522b..5425472d03 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6276,15 +6276,20 @@ export_handle_done (GObject      *source,
   ExportHandleData *data = (ExportHandleData *)user_data;
   GtkWindowPrivate *priv = gtk_window_get_instance_private (data->window);
   char *handle;
-  char *prefixed;
 
   handle = gdk_toplevel_export_handle_finish (GDK_TOPLEVEL (priv->surface), result, NULL);
-  prefixed = prefix_handle (priv->display, handle);
+  if (handle)
+    {
+      char *prefixed;
 
-  data->callback (data->window, prefixed, data->user_data);
+      prefixed = prefix_handle (priv->display, handle);
+      data->callback (data->window, prefixed, data->user_data);
+      g_free (prefixed);
+      g_free (handle);
+    }
+  else
+    data->callback (data->window, NULL, data->user_data);
 
-  g_free (handle);
-  g_free (prefixed);
 
   g_free (data);
 }
-- 
2.30.2