aboutsummaryrefslogtreecommitdiffstats
path: root/epan/uat.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2007-12-16 13:17:37 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2007-12-16 13:17:37 +0000
commit0238daecf669f8bf28f004ea6967a14bdfe63164 (patch)
tree41e2a5587c09f70544d4c389a32b6349bc6cc604 /epan/uat.c
parent672659c0c24fe763674be9da1e74384b886c9057 (diff)
From Jim Young:
Fixed reading uat personal files before global files. This fixes bug 2070. svn path=/trunk/; revision=23883
Diffstat (limited to 'epan/uat.c')
-rw-r--r--epan/uat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/uat.c b/epan/uat.c
index b5148753c9..e43641537a 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -160,7 +160,7 @@ gchar* uat_get_actual_filename(uat_t* uat, gboolean for_writing) {
if (! for_writing ) {
gchar* data_fname = get_datafile_path(uat->filename);
- if (file_exists(data_fname)) {
+ if ((! file_exists(pers_fname) ) && file_exists(data_fname)) {
return data_fname;
}
}