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 <a.broman58@gmail.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/tshark.c b/tshark.c
index c5f9aa4c56..62208a0c6e 100644
--- a/tshark.c
+++ b/tshark.c
@@ -2626,6 +2626,8 @@ capture_input_new_file(capture_session *cap_session, gchar *new_file)
 
   /* if we are in real-time mode, open the new file now */
   if (do_dissection) {
+    /* this is probably unecessary, but better safe than sorry */
+    ((capture_file *)cap_session->cf)->open_type = WTAP_TYPE_AUTO;
     /* Attempt to open the capture file and set up to read from it. */
     switch(cf_open((capture_file *)cap_session->cf, capture_opts->save_file, WTAP_TYPE_AUTO, is_tempfile, &err)) {
     case CF_OK:
@@ -4009,6 +4011,7 @@ cf_open(capture_file *cf, const char *fname, unsigned int type, gboolean is_temp
   cf->unsaved_changes = FALSE;
 
   cf->cd_t      = wtap_file_type_subtype(cf->wth);
+  cf->open_type = type;
   cf->count     = 0;
   cf->drops_known = FALSE;
   cf->drops     = 0;