Wireshark-commits: [Wireshark-commits] master d1873db: Fix Bug 9903: 'Clicking reload-file ignores

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 21 Mar 2014 17:51:47 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d1873dbcc89eb3138027d8e5c5e4c5b12420e797
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

d1873db by Hadriel Kaplan (hadrielk@xxxxxxxxx):

    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@xxxxxxxxx>
    

Actions performed:

    from  49be990   Make Mac OS X buildbot happy (fix index shadow variable)
    adds  d1873db   Fix Bug 9903: 'Clicking reload-file ignores selected file format reader'


Summary of changes:
 cfile.h                     |    1 +
 epan/wslua/wslua.h          |    8 +++++---
 epan/wslua/wslua_file.c     |   12 ++++++------
 file.c                      |   18 +++++++++++++++++-
 rawshark.c                  |    1 +
 reordercap.c                |    2 ++
 tfshark.c                   |    3 +++
 tshark.c                    |    3 +++
 ui/gtk/capture_file_dlg.c   |    4 ++--
 ui/gtk/funnel_stat.c        |    2 +-
 ui/qt/main_window_slots.cpp |    2 +-
 ui/tap_export_pdu.c         |    1 +
 12 files changed, 43 insertions(+), 14 deletions(-)