Manfred Hollstein
4787295ea3
- Add gxo-282.patch
* backport fix for crash on window close
(gxo#apps/xfce4-terminal#282)
OBS-URL: https://build.opensuse.org/request/show/1123430
OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-terminal?expand=0&rev=64
51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
From 036c903e1d6ac8eee72d920d7019c7836381fa2a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
|
|
Date: Mon, 23 Oct 2023 19:24:09 +0200
|
|
Subject: [PATCH] Do not reconnect accels when closing last tab
|
|
|
|
G_IS_OBJECT and similar derived macros are not valid tests of whether an
|
|
object is still alive. They are intended to test the type of an object
|
|
assumed to be alive (although they return FALSE for a null pointer for
|
|
convenience).
|
|
|
|
This can cause a crash on some systems when closing last tab if
|
|
/misc-always-show-tabs is TRUE.
|
|
|
|
Fixes: 31712a009ec4db4a0731431905a169fe610286e5
|
|
---
|
|
terminal/terminal-screen.c | 3 +--
|
|
terminal/terminal-window.c | 3 ++-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
|
|
index 6fe8f1c2..52ee7549 100644
|
|
--- a/terminal/terminal-screen.c
|
|
+++ b/terminal/terminal-screen.c
|
|
@@ -3151,8 +3151,7 @@ terminal_screen_widget_append_accels (TerminalScreen *screen,
|
|
{
|
|
terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
|
|
|
|
- if (G_LIKELY (G_IS_OBJECT (screen->terminal)))
|
|
- g_object_set (G_OBJECT (screen->terminal), "accel-group", accel_group, NULL);
|
|
+ g_object_set (G_OBJECT (screen->terminal), "accel-group", accel_group, NULL);
|
|
}
|
|
|
|
|
|
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
|
|
index fc830237..71767208 100644
|
|
--- a/terminal/terminal-window.c
|
|
+++ b/terminal/terminal-window.c
|
|
@@ -2577,7 +2577,8 @@ terminal_window_do_close_tab (TerminalScreen *screen,
|
|
gtk_widget_destroy (GTK_WIDGET (screen));
|
|
|
|
/* reconnect the accels of the active terminal */
|
|
- terminal_screen_widget_append_accels (window->priv->active, window->priv->accel_group);
|
|
+ if (screen != window->priv->active)
|
|
+ terminal_screen_widget_append_accels (window->priv->active, window->priv->accel_group);
|
|
}
|
|
|
|
|
|
--
|
|
GitLab
|
|
|