diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-01-27 14:45:31 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-01-27 14:45:31 +0000 |
| commit | 45572b611c4a3f704d9f143ea3be4e8f43db1294 (patch) | |
| tree | 80f8d6970362e176ee2789efc57d4014ca67e66b /epan/filesystem.c | |
| parent | c3fa6a267c1fd8a71e05a1c620fb6f62016cc349 (diff) | |
Do not change profile if directory creation failed, and change to default
profile if existing profile was deleted.
svn path=/trunk/; revision=24208
Diffstat (limited to 'epan/filesystem.c')
| -rw-r--r-- | epan/filesystem.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/epan/filesystem.c b/epan/filesystem.c index 13995f2aed..7ad214e9a2 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -793,7 +793,8 @@ set_profile_name(const gchar *profilename) g_free (persconfprofile); } - if (profilename && strlen(profilename) > 0) { + if (profilename && strlen(profilename) > 0 && + strcmp(profilename, DEFAULT_PROFILE) != 0) { persconfprofile = g_strdup (profilename); } else { /* Default Profile */ @@ -929,9 +930,10 @@ get_persconffile_dir(const gchar *profilename) g_free (persconffile_profile_dir); } - if (profilename) { - persconffile_profile_dir = g_strdup_printf ("%s%s%s", get_profiles_dir (), G_DIR_SEPARATOR_S, - profilename); + if (profilename && strlen(profilename) > 0 && + strcmp(profilename, DEFAULT_PROFILE) != 0) { + persconffile_profile_dir = g_strdup_printf ("%s%s%s", get_profiles_dir (), + G_DIR_SEPARATOR_S, profilename); } else { persconffile_profile_dir = g_strdup_printf (get_persconffile_dir_no_profile ()); } @@ -959,7 +961,8 @@ delete_directory (const char *directory, char **pf_dir_path_return) if ((dir = eth_dir_open(directory, 0, NULL)) != NULL) { while ((file = eth_dir_read_name(dir)) != NULL) { - filename = g_strdup_printf ("%s%s%s", directory, G_DIR_SEPARATOR_S, eth_dir_get_name(file)); + filename = g_strdup_printf ("%s%s%s", directory, G_DIR_SEPARATOR_S, + eth_dir_get_name(file)); if (test_for_directory(filename) != EISDIR) { ret = eth_remove(filename); #if 0 |