diff options
| -rw-r--r-- | capchild/capture_ifinfo.c | 5 | ||||
| -rw-r--r-- | ui/qt/interface_tree.cpp | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c index 984fa664fe..94af1c0274 100644 --- a/capchild/capture_ifinfo.c +++ b/capchild/capture_ifinfo.c @@ -189,11 +189,8 @@ capture_interface_list(int *err, char **err_str, void (*update_cb)(void)) g_strfreev(raw_list); /* Check to see if we built a list */ - if (if_list == NULL) { + if (if_list == NULL) *err = NO_INTERFACES_FOUND; - if (err_str) - *err_str = g_strdup("No interfaces found"); - } #ifdef HAVE_PCAP_REMOTE if (remote_interface_list && g_list_length(remote_interface_list) > 0) { append_remote_list(if_list); diff --git a/ui/qt/interface_tree.cpp b/ui/qt/interface_tree.cpp index cc85c68841..2d03390bf2 100644 --- a/ui/qt/interface_tree.cpp +++ b/ui/qt/interface_tree.cpp @@ -135,7 +135,13 @@ void InterfaceTree::getInterfaceList() if (if_list == NULL) { QTreeWidgetItem *ti = new QTreeWidgetItem(); - QLabel *err_label = new QLabel(gchar_free_to_qstring(err_str)); + QLabel *err_label; + + if (err == CANT_GET_INTERFACE_LIST || err == DONT_HAVE_PCAP) { + err_label = new QLabel(gchar_free_to_qstring(err_str)); + } else { + err_label = new QLabel("No interfaces found"); + } err_label->setWordWrap(true); setColumnCount(1); @@ -143,8 +149,6 @@ void InterfaceTree::getInterfaceList() setItemWidget(ti, 0, err_label); resizeColumnToContents(0); return; - } else if (err_str) { - g_free(err_str); } // XXX Do we need to check for this? capture_interface_list returns an error if the length is 0. |