Don't close the currently loaded capture file in capture_start(), do so
authorGuy Harris <guy@alum.mit.edu>
Sun, 11 Mar 2012 20:08:54 +0000 (20:08 -0000)
committerGuy Harris <guy@alum.mit.edu>
Sun, 11 Mar 2012 20:08:54 +0000 (20:08 -0000)
commit681c29c5d51bd9ff11f5862089e727204f092304
tree9bc53e8eef4f041dfa5eb3473f156604f1f515ad
parent6f3ee54d62bf22540d1e770f304c714a8424fdd3
Don't close the currently loaded capture file in capture_start(), do so
in its callers; when starting a capture with "wireshark -k", there's no
capture file to close, and closing it might be provoking some UI actions
that cause crashes on Windows.

Don't copy the list of selected interfaces to the list of capture
interfaces in capture_start(), either, do that in the callers; we were
already doing that in one place and, in one of the remaining cases,
namely "wireshark -k", we should do so only if no capture interfaces
were supplied on the command line.  (I.e., the set of interfaces on
which we want to capture depends on where in the UI the capture is being
started.)

svn path=/trunk/; revision=41491
capture.c
ui/gtk/capture_dlg.c
ui/gtk/main.c