aboutsummaryrefslogtreecommitdiffstats
path: root/capture.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-08-06 18:24:21 +0000
committerGerald Combs <gerald@wireshark.org>2012-08-06 18:24:21 +0000
commita6d0c55a417f22c69ef5bbc6875b90442a4a03fb (patch)
treeedc3535a2987de34a6ef09063da9813556b7c3a4 /capture.c
parent16821fe43cf025b81bfab8b259ed11bd8a40c609 (diff)
Don't call main_window_update() from capture_input_new_packets()
on Windows. Otherwise we end up looping forever on a NULL event in main_window_update(). svn path=/trunk/; revision=44283
Diffstat (limited to 'capture.c')
-rw-r--r--capture.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/capture.c b/capture.c
index 765390278f..46304fc85a 100644
--- a/capture.c
+++ b/capture.c
@@ -430,7 +430,10 @@ capture_input_new_packets(capture_options *capture_opts, int to_read)
}
/* update the main window so we get events (e.g. from the stop toolbar button) */
+ /* This causes a hang on Windows (see bug 7305). Do we need this on any platform? */
+#ifndef _WIN32
main_window_update();
+#endif
if(capture_opts->show_info)
capture_info_new_packets(to_read);