diff --git a/capture.c b/capture.c index 3893587ed0..271849be40 100644 --- a/capture.c +++ b/capture.c @@ -222,9 +222,9 @@ capture_input_new_file(capture_options *capture_opts, gchar *new_file) break; } - cf_callback_invoke(cf_cb_live_capture_update_started, capture_opts->cf); + cf_callback_invoke(cf_cb_live_capture_update_started, capture_opts); } else { - cf_callback_invoke(cf_cb_live_capture_fixed_started, capture_opts->cf); + cf_callback_invoke(cf_cb_live_capture_fixed_started, capture_opts); } diff --git a/gtk/main.c b/gtk/main.c index fa006d15fa..452ffc061f 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1306,11 +1306,7 @@ main_cf_cb_live_capture_update_started(capture_options *capture_opts) packets (yes, I know, we don't have any *yet*). */ set_menus_for_captured_packets(TRUE); - if(capture_opts->iface) { - capture_msg = g_strdup_printf(" %s: ", get_interface_descriptive_name(capture_opts->iface)); - } else { - capture_msg = g_strdup_printf(" "); - } + capture_msg = g_strdup_printf(" %s: ", get_interface_descriptive_name(capture_opts->iface)); statusbar_push_file_msg(capture_msg); @@ -1333,11 +1329,7 @@ main_cf_cb_live_capture_fixed_started(capture_options *capture_opts) packets (yes, I know, we don't have any *yet*). */ /*set_menus_for_captured_packets(TRUE);*/ - if(capture_opts->iface) { - capture_msg = g_strdup_printf(" %s: ", get_interface_descriptive_name(capture_opts->iface)); - } else { - capture_msg = g_strdup_printf(" "); - } + capture_msg = g_strdup_printf(" %s: ", get_interface_descriptive_name(capture_opts->iface)); statusbar_push_file_msg(capture_msg);