From d1873dbcc89eb3138027d8e5c5e4c5b12420e797 Mon Sep 17 00:00:00 2001 From: Hadriel Kaplan Date: Thu, 20 Mar 2014 12:57:29 -0400 Subject: Fix Bug 9903: 'Clicking reload-file ignores selected file format reader' There's a relatively new feature in 1.11.3 to select a specific file format reader, instead of relying on magics or heuristics. If you select a file reader and open a file, open it, and then click the reload-file button or go to View->Reload or press the ctrl-R keymap, the file is reloaded but using the magic/heuristics again instead of the file format reader you previously chose. Likewise, the Lua relaod() function has the same issue (which is how I found this problem). I have tested this change by hand, using a Lua script, but I didn't add it to the testsuite because I need another change for my test script to work correctly. (an enhancement rather than a bug fix, which I'll submit separately) Change-Id: I48c2d9ea443e37fd9d41be43d6b6cd5a866d5b01 Reviewed-on: https://code.wireshark.org/review/764 Reviewed-by: Anders Broman --- ui/gtk/funnel_stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/gtk/funnel_stat.c') diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index 1b3dc00662..5d03fefbde 100644 --- a/ui/gtk/funnel_stat.c +++ b/ui/gtk/funnel_stat.c @@ -515,7 +515,7 @@ static gboolean funnel_open_file(const char* fname, const char* filter, const ch } } - + /* This closes the current file if it succeeds. */ if (cf_open(&cfile, fname, WTAP_TYPE_AUTO, FALSE, &err) != CF_OK) { *err_str = g_strerror(err); if (rfcode != NULL) dfilter_free(rfcode); -- cgit v1.2.1