aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-04-05 15:13:17 -0700
committerGuy Harris <guy@alum.mit.edu>2015-04-05 22:13:45 +0000
commit24af6eeeea3828bbf4e41ad70377aabc3f26252e (patch)
tree2c891287fab4b4cadb9100bf5f24ffc1841f6073
parentfd510bef347d643f1a360ccd578f2cf19f5a855c (diff)
Pop the welcome screen message when we close a file.
That fixes a bug where the welcome screen gets stuck at "Waiting for capture input data..." if you do a non-update-list-of-packets-in-real- time capture, stop the capture, and close the capture. Change-Id: Ia77900707c6287e091a1acd2a6640462e0e4fb37 Reviewed-on: https://code.wireshark.org/review/7931 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--ui/gtk/main_welcome.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index ada88bc422..915d7794ac 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -1436,13 +1436,20 @@ get_welcome_window(void)
return welcome_hb;
}
+static void
+welcome_cf_file_closing_cb(capture_file *cf _U_)
+{
+ welcome_header_pop_msg();
+}
+
void
-welcome_cf_callback(gint event, gpointer data _U_, gpointer user_data _U_)
+welcome_cf_callback(gint event, gpointer data, gpointer user_data _U_)
{
switch(event) {
case(cf_cb_file_opened):
break;
case(cf_cb_file_closing):
+ welcome_cf_file_closing_cb((capture_file *)data);
break;
case(cf_cb_file_closed):
break;