summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2014-02-24 16:05:16 +1300
committerRobert Ancell <robert.ancell@canonical.com>2014-02-24 16:05:16 +1300
commit265e23c54e550e846e645c3a602077e4faad7d92 (patch)
tree5d6fb9dc98253213b5d90acec448276860091358 /src
parent99cd32fb4fb4bbcd1aea8591345ea222d3fbd579 (diff)
downloadlightdm-265e23c54e550e846e645c3a602077e4faad7d92.tar.gz
Fix shared directory name not being returned if already exists
Diffstat (limited to 'src')
-rw-r--r--src/shared-data-manager.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c
index 5103dc0e..c2892212 100644
--- a/src/shared-data-manager.c
+++ b/src/shared-data-manager.c
@@ -100,8 +100,13 @@ shared_data_manager_ensure_user_dir (SharedDataManager *manager, const gchar *us
g_debug ("Creating shared data directory %s", path);
result = g_file_make_directory (file, NULL, &error);
- if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
- g_warning ("Could not create user data directory %s: %s", path, error->message);
+ if (error)
+ {
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
+ result = TRUE;
+ else
+ g_warning ("Could not create user data directory %s: %s", path, error->message);
+ }
g_clear_error (&error);
if (!result)
{