diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 1999-09-23 07:20:20 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 1999-09-23 07:20:20 +0000 |
| commit | 75cb766ce2b81191313aa9ce8dcf4ed45b50c059 (patch) | |
| tree | fb0528417e2af5d6f50cc475e7ff1e5a345a3c3c /capture.c | |
| parent | ea9761f917acd90c78066f4f1b5a300f40141548 (diff) | |
If we forcibly turn off "fork_mode" if the user doesn't enable "Update
list of packets in real time" in the "Capture/Start" dialog box,
"ethereal -F" won't work - you get your choice of non-forked capture or
"-S".
Don't have "fork_mode" track "sync_mode"; instead, in those places where
we check for "fork_mode", check for "sync_mode" as well.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@711 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'capture.c')
| -rw-r--r-- | capture.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.69 1999/09/23 07:04:23 guy Exp $ + * $Id: capture.c,v 1.70 1999/09/23 07:20:11 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -106,7 +106,7 @@ do_capture(void) guint byte_count; char *msg; - if (fork_mode) { + if (sync_mode || fork_mode) { /* "capture()" will be run in the child; close the capture now. */ close_cap_file(&cf, info_bar, file_ctx); } @@ -128,7 +128,7 @@ do_capture(void) cf.save_file = g_strdup(tmpname); cf.user_saved = 0; - if (fork_mode) { /* use fork() for capture */ + if (sync_mode || fork_mode) { /* use fork() for capture */ int fork_child; char ssnap[24]; char scount[24]; /* need a constant for len of numbers */ @@ -272,7 +272,7 @@ capture(void) if (pch == NULL) { /* Well, we couldn't start the capture. */ - if (!fork_mode) { + if (!sync_mode && !fork_mode) { /* In fork mode, we shouldn't do any UI stuff until we pop up the capture-progress window, and, since we couldn't start the capture, we haven't popped it up. */ |