diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2005-09-07 21:47:51 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2005-09-07 21:47:51 +0000 |
| commit | 56c76e637eb5867ac5a2e27af7af418052e53a23 (patch) | |
| tree | e3a94659ab3b6740bd4c5c4a3c72021d68fd3a99 /gtk/main.c | |
| parent | 11dc88286a6483a6a64ec3fed94622f931b97e73 (diff) | |
don't wait for a keypress if this is a capture child. This was very annoying, as stopping a capture seems to freeze Ethereal, but it simply waits for a keypress on the capture_child's console window.
svn path=/trunk/; revision=15718
Diffstat (limited to 'gtk/main.c')
| -rw-r--r-- | gtk/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/main.c b/gtk/main.c index 5e589ef522..f63928f368 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -172,6 +172,7 @@ GString *comp_info_str, *runtime_info_str; gchar *ethereal_path = NULL; gboolean have_capture_file = FALSE; /* XXX - is there an aquivalent in cfile? */ +gboolean capture_child; /* True if this is the child for "-S" */ #ifdef _WIN32 static gboolean has_console; /* TRUE if app has console */ static void destroy_console(void); @@ -1608,7 +1609,6 @@ main(int argc, char *argv[]) e_prefs *prefs; char badopt; GtkWidget *splash_win = NULL; - gboolean capture_child; /* True if this is the child for "-S" */ GLogLevelFlags log_flags; guint go_to_packet = 0; int optind_initial; @@ -2609,7 +2609,7 @@ create_console(void) static void destroy_console(void) { - if (has_console) { + if (has_console && !capture_child) { printf("\n\nPress any key to exit\n"); _getch(); FreeConsole(); |