diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-29 04:05:27 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-29 04:05:27 +0000 |
| commit | ba49d9bcf01a597ebec66c3d65c4813ebf174806 (patch) | |
| tree | 24a8dc06b7825a9b8d252a148eeb0809d75201e6 /ui/recent.c | |
| parent | 58d01512b16728b357b2f6481c592a71c7ab8435 (diff) | |
| download | wireshark-ba49d9bcf01a597ebec66c3d65c4813ebf174806.tar.gz wireshark-ba49d9bcf01a597ebec66c3d65c4813ebf174806.tar.bz2 wireshark-ba49d9bcf01a597ebec66c3d65c4813ebf174806.zip | |
Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
the PortableApps version relies on U3_-prefixed environment variables.
svn path=/trunk/; revision=52941
Diffstat (limited to 'ui/recent.c')
| -rw-r--r-- | ui/recent.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ui/recent.c b/ui/recent.c index 480b99e275..41f5f93263 100644 --- a/ui/recent.c +++ b/ui/recent.c @@ -44,6 +44,7 @@ #include "ui/simple_dialog.h" #include "ui/ui_util.h" +#include <wsutil/u3.h> #include <wsutil/file_util.h> #include <wsutil/str_util.h> @@ -663,7 +664,11 @@ write_profile_recent(void) if (get_last_open_dir() != NULL) { fprintf(rf, "\n# Last directory navigated to in File Open dialog.\n"); - fprintf(rf, RECENT_GUI_FILEOPEN_REMEMBERED_DIR ": %s\n", get_last_open_dir()); + + if(u3_active()) + fprintf(rf, RECENT_GUI_FILEOPEN_REMEMBERED_DIR ": %s\n", u3_contract_device_path(get_last_open_dir())); + else + fprintf(rf, RECENT_GUI_FILEOPEN_REMEMBERED_DIR ": %s\n", get_last_open_dir()); } fclose(rf); @@ -985,7 +990,10 @@ read_set_recent_pair_dynamic(gchar *key, const gchar *value, return PREFS_SET_SYNTAX_ERR; } if (strcmp(key, RECENT_KEY_CAPTURE_FILE) == 0) { - add_menu_recent_capture_file(value); + if (u3_active()) + add_menu_recent_capture_file(u3_expand_device_path(value)); + else + add_menu_recent_capture_file(value); } else if (strcmp(key, RECENT_KEY_DISPLAY_FILTER) == 0) { dfilter_combo_add_recent(value); } else if (strcmp(key, RECENT_KEY_CAPTURE_FILTER) == 0) { |