diff options
| author | Benjamin Berg <bberg@redhat.com> | 2022-04-17 15:58:13 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-08-16 17:28:32 +0000 |
| commit | caf04c78461487e0f225e9568570ab0ba96f729e (patch) | |
| tree | bc1396bf2ad2f2fc47e752a08954360d1a979dd2 | |
| parent | 26df8c6639f844bb1db70cc409a1de8a43cb807d (diff) | |
| download | gnome-session-caf04c78461487e0f225e9568570ab0ba96f729e.tar.gz | |
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
| -rw-r--r-- | gnome-session/main.c | 10 |
1 files 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); |