aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2006-03-07 22:14:12 +0000
committerGerald Combs <gerald@wireshark.org>2006-03-07 22:14:12 +0000
commita103501de28f0af88dc6912a49fcf78522f61d37 (patch)
treef6eca35a1378e1c903a840ba2f684093dac9cee7 /gtk
parented9d4d16c77b84078da5ece8cc9237313fcd58d9 (diff)
Fix what Coverity CID 61 was actually complaining about: Don't pass a NULL
value to get_interface_descriptive_name(). svn path=/trunk/; revision=17513
Diffstat (limited to 'gtk')
-rw-r--r--gtk/main.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/gtk/main.c b/gtk/main.c
index 14a6297d28..1c5e8e2ff0 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1500,8 +1500,6 @@ main_cf_cb_live_capture_update_started(capture_options *capture_opts)
gchar *capture_msg;
gchar *title;
- g_assert(capture_opts != NULL);
-
/* We've done this in "prepared" above, but it will be cleared while
switching to the next multiple file. */
if(capture_opts->iface) {
@@ -1521,9 +1519,14 @@ main_cf_cb_live_capture_update_started(capture_options *capture_opts)
statusbar_pop_file_msg();
- capture_msg = g_strdup_printf(" %s: <live capture in progress> to file: %s",
- get_interface_descriptive_name(capture_opts->iface),
- (capture_opts->save_file) ? capture_opts->save_file : "");
+ if(capture_opts->iface) {
+ capture_msg = g_strdup_printf(" %s: <live capture in progress> to file: %s",
+ get_interface_descriptive_name(capture_opts->iface),
+ (capture_opts->save_file) ? capture_opts->save_file : "");
+ } else {
+ capture_msg = g_strdup_printf(" <live capture in progress> to file: %s",
+ (capture_opts->save_file) ? capture_opts->save_file : "");
+ }
statusbar_push_file_msg(capture_msg);