summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--daemon/gdm-launch-environment.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
index 195bf592..5d8c8ada 100644
--- a/daemon/gdm-launch-environment.c
+++ b/daemon/gdm-launch-environment.c
@@ -532,17 +532,17 @@ gdm_launch_environment_stop (GdmLaunchEnvironment *launch_environment)
{
if (launch_environment->priv->pid > 1) {
gdm_signal_pid (-launch_environment->priv->pid, SIGTERM);
- } else {
- if (launch_environment->priv->session != NULL) {
- gdm_session_stop_conversation (launch_environment->priv->session, "gdm-launch-environment");
- gdm_session_close (launch_environment->priv->session);
+ }
- g_clear_object (&launch_environment->priv->session);
- }
+ if (launch_environment->priv->session != NULL) {
+ gdm_session_stop_conversation (launch_environment->priv->session, "gdm-launch-environment");
+ gdm_session_close (launch_environment->priv->session);
- g_signal_emit (G_OBJECT (launch_environment), signals [STOPPED], 0);
+ g_clear_object (&launch_environment->priv->session);
}
+ g_signal_emit (G_OBJECT (launch_environment), signals [STOPPED], 0);
+
return TRUE;
}