From Jim Young:

Fixed reading uat personal files before global files.

This fixes bug 2070.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23883 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/uat.c b/epan/uat.c
index b5148753c992c5f047cd40ad912dd99b86a2e423..e43641537a123d948a78956e316e7192ca1d23c8 100644 (file)
--- 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;
                }
        }