summaryrefslogtreecommitdiff
path: root/daemon/gdm-display.c
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2007-11-15 00:56:48 +0000
committerRay Strode <halfline@src.gnome.org>2007-11-15 00:56:48 +0000
commit05b39622b4ae610c16a7154cb43a059c539bbda9 (patch)
tree4bbecf0b4843dc67494f2c7550a0ae42848bf952 /daemon/gdm-display.c
parent4ab7fb059fda9085a02079f8132af7dfa7d51d72 (diff)
downloadgdm-05b39622b4ae610c16a7154cb43a059c539bbda9.tar.gz
only close access file if it's open
2007-11-14 Ray Strode <rstrode@redhat.com> * daemon/gdm-display.c (gdm_display_real_unmanage): only close access file if it's open svn path=/trunk/; revision=5509
Diffstat (limited to 'daemon/gdm-display.c')
-rw-r--r--daemon/gdm-display.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index 5eb44b1a..5f46a86e 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -477,13 +477,17 @@ gdm_display_real_unmanage (GdmDisplay *display)
display->priv->slave_proxy = NULL;
}
- gdm_display_access_file_close (display->priv->user_access_file);
- g_object_unref (display->priv->user_access_file);
- display->priv->user_access_file = NULL;
+ if (display->priv->user_access_file != NULL) {
+ gdm_display_access_file_close (display->priv->user_access_file);
+ g_object_unref (display->priv->user_access_file);
+ display->priv->user_access_file = NULL;
+ }
- gdm_display_access_file_close (display->priv->access_file);
- g_object_unref (display->priv->access_file);
- display->priv->access_file = NULL;
+ if (display->priv->user_access_file != NULL) {
+ gdm_display_access_file_close (display->priv->access_file);
+ g_object_unref (display->priv->access_file);
+ display->priv->access_file = NULL;
+ }
return TRUE;
}