From caf04c78461487e0f225e9568570ab0ba96f729e Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Sun, 17 Apr 2022 15:58:13 +0200 Subject: [PATCH] main: Also clear error when running under GDM Commit 0349a77ad875 ("main: Lower fallback warning when running in GDM") removed error logging when running under GDM. However, the error was not cleared afterwards, leaking it to later operations and causing other issues. Closes: #105 --- gnome-session/main.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnome-session/main.c b/gnome-session/main.c index a460a849..6f033246 100644 --- a/gnome-session/main.c +++ b/gnome-session/main.c @@ -543,10 +543,9 @@ main (int argc, char **argv) #ifdef HAVE_SYSTEMD gsm_util_export_user_environment (&error); - if (error && !g_getenv ("RUNNING_UNDER_GDM")) { + if (error && !g_getenv ("RUNNING_UNDER_GDM")) g_warning ("Failed to upload environment to systemd: %s", error->message); - g_clear_error (&error); - } + g_clear_error (&error); #endif #ifdef ENABLE_SYSTEMD_SESSION @@ -567,10 +566,9 @@ main (int argc, char **argv) * in a previous session */ gsm_util_systemd_reset_failed (&error); - if (error && !g_getenv ("RUNNING_UNDER_GDM")) { + if (error && !g_getenv ("RUNNING_UNDER_GDM")) g_warning ("Failed to reset failed state of units: %s", error->message); - g_clear_error (&error); - } + g_clear_error (&error); /* We don't escape the name (i.e. we leave any '-' intact). */ gnome_session_target = g_strdup_printf ("gnome-session-%s@%s.target", session_type, session_name); -- GitLab