[network-manager-openvpn] core: don't clean up management socket if it wasn't set up in the first place
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn] core: don't clean up management socket if it wasn't set up in the first place
- Date: Mon, 4 Apr 2011 23:38:49 +0000 (UTC)
commit 70b6a32807cc67cf1fb208d7961d940647348f2b
Author: Dan Williams <dcbw redhat com>
Date: Mon Apr 4 18:33:33 2011 -0500
core: don't clean up management socket if it wasn't set up in the first place
src/nm-openvpn-service.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index 105a163..de86001 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -291,9 +291,12 @@ nm_openvpn_disconnect_management_socket (NMOpenvpnPlugin *plugin)
if (!io_data)
return;
- g_source_remove (io_data->socket_channel_eventid);
- g_io_channel_shutdown (io_data->socket_channel, FALSE, NULL);
- g_io_channel_unref (io_data->socket_channel);
+ if (io_data->socket_channel_eventid)
+ g_source_remove (io_data->socket_channel_eventid);
+ if (io_data->socket_channel) {
+ g_io_channel_shutdown (io_data->socket_channel, FALSE, NULL);
+ g_io_channel_unref (io_data->socket_channel);
+ }
g_free (io_data->username);
g_free (io_data->proxy_username);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]