aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/main.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2003-11-02 19:31:20 +0000
committerGerald Combs <gerald@wireshark.org>2003-11-02 19:31:20 +0000
commit2bdac88860428b3e7595237c6f58295175fdf402 (patch)
tree5145630c74a3287312e5651820c026f54fe384cc /gtk/main.c
parentd084a16f924b87ad3bdbe81ff13d8d29bafab1ba (diff)
The recent link-layer type additions broke "-r". Make it work again.
svn path=/trunk/; revision=8857
Diffstat (limited to 'gtk/main.c')
-rw-r--r--gtk/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/main.c b/gtk/main.c
index 752689d297..36c2908ac0 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.328 2003/11/01 03:03:25 guy Exp $
+ * $Id: main.c,v 1.329 2003/11/02 19:31:20 gerald Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2131,7 +2131,7 @@ main(int argc, char *argv[])
} else {
/* We're supposed to do a live capture; did the user also specify
a capture file to be read? */
- if (cf_name) {
+ if (start_capture && cf_name) {
/* Yes - that's bogus. */
fprintf(stderr, "ethereal: You cannot specify both a live capture and a capture file to be read.\n");
exit(1);