X-Git-Url: https://roy.marples.name/git

diff --git a/src/dhcpcd-qt/dhcpcd-wi.cpp b/src/dhcpcd-qt/dhcpcd-wi.cpp
index 5aa4663..b6326e2 100644
--- a/src/dhcpcd-qt/dhcpcd-wi.cpp
+++ b/src/dhcpcd-qt/dhcpcd-wi.cpp
@@ -58,9 +58,17 @@ DhcpcdWi::DhcpcdWi(DhcpcdQt *parent, DHCPCD_WPA *wpa)
 DhcpcdWi::~DhcpcdWi()
 {
 
-	dhcpcd_wi_scans_free(scans);
-	if (notifier != NULL)
+	if (menu) {
+		delete menu;
+		menu = NULL;
+	}
+
+	if (notifier) {
 		delete notifier;
+		notifier = NULL;
+	}
+
+	dhcpcd_wi_scans_free(scans);
 }
 
 DHCPCD_WPA *DhcpcdWi::getWpa()
@@ -152,10 +160,12 @@ void DhcpcdWi::createMenu(QMenu *menu)
 QMenu *DhcpcdWi::createIfMenu(QMenu *parent)
 {
 	DHCPCD_IF *ifp;
+	QIcon icon;
 
 	ifp = dhcpcd_wpa_if(wpa);
 	menu = new DhcpcdIfMenu(ifp, parent);
-	menu->setIcon(QIcon::fromTheme("network-wireless"));
+	icon = DhcpcdQt::getIcon("devices", "network-wireless");
+	menu->setIcon(icon);
 	createMenu1(menu);
 	return menu;
 }